fix:活码对接数据组

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java

@@ -100,7 +100,6 @@ public class HmQrcodeController {
     public RestResponse<StatisticsDTO> list(@RequestBody HmQrcodeListQO hmQrcodeListQO) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         hmQrcodeListQO.getInFields().setEnterpriseId(loginUser.getEnterpriseId());
-        hmQrcodeListQO.setPageNo(hmQrcodeListQO.getPageNo());
         List<String> storeList =  staffApiService.getHaoBanStoreIdsRolesByClerkId(loginUser.getClerkId(), loginUser.getWxEnterpriseId());
         if (CollectionUtils.isEmpty(storeList)) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_100007.getCode()),HaoBanErrCode.ERR_100007.getMsg());
@@ -157,7 +156,9 @@ public class HmQrcodeController {
             StatisticsDTO dto = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_trend_m, hmTrendQO);
             list= JSON.parseArray(JSON.toJSONString(dto.getData()), Map.class);
         }
-        hmTrendVO.setDateList(list);
+        if (hmTrendVO != null) {
+            hmTrendVO.setDateList(list);
+        }
         return RestResponse.successResult(hmTrendVO);
     }
 
@@ -193,7 +194,6 @@ public class HmQrcodeController {
     @RequestMapping(value = "detail-clerk-list-page", method = RequestMethod.POST)
     public RestResponse detailClerkListPage(@RequestBody HmDetailClerkListQO hmDetailClerkListQO) {
         hmDetailClerkListQO.getInFields().setEnterpriseId(AuthWebRequestUtil.getLoginUser().getEnterpriseId());
-        hmDetailClerkListQO.setPageNo(hmDetailClerkListQO.getPageNum());
         Long hmId = hmDetailClerkListQO.getInFields().getHmId();
         HmQrcodeDTO hmQrcodeDTO = hmQrcodeApiService.queryById(hmId);
         if (hmQrcodeDTO == null) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/data/HmDetailClerkListQO.java

 package com.gic.haoban.manage.web.qo.hm.data;
 
-import com.gic.haoban.base.api.common.BasePageInfo;
-
 import java.io.Serializable;
 
-public class HmDetailClerkListQO extends BasePageInfo implements Serializable {
+public class HmDetailClerkListQO implements Serializable {
     private static final long serialVersionUID = -5504797924745631906L;
     private InFields inFields;
     private Integer pageNo;
+    private Integer pageSize;
 
     public InFields getInFields() {
         return inFields;
@@ -25,6 +24,14 @@ public class HmDetailClerkListQO extends BasePageInfo implements Serializable {
         this.pageNo = pageNo;
     }
 
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
     public static class InFields {
         private String enterpriseId;
         private Long hmId;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/data/HmQrcodeListQO.java

 package com.gic.haoban.manage.web.qo.hm.data;
 
-import com.gic.haoban.base.api.common.BasePageInfo;
-
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -12,14 +10,23 @@ import java.util.List;
  * @author mozhu
  * @since 2022-07-04 15:42:20
  */
-public class HmQrcodeListQO extends BasePageInfo implements Serializable {
+public class HmQrcodeListQO implements Serializable {
 
     private static final long serialVersionUID = 887910678030827375L;
 
     private Integer pageNo;
+    private Integer pageSize;
 
     private InFields inFields;
 
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
     public Integer getPageNo() {
         return pageNo;
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/data/HmTrendQO.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 public class HmTrendQO implements Serializable {
     private static final long serialVersionUID = 5002448176485217071L;
+
     private InFields inFields;
 
     public InFields getInFields() {