feat: 数据组分页数据

haoban-manage3-service/src/test/java/MaterialReportServiceTest.java

@@ -52,8 +52,8 @@ public class MaterialReportServiceTest {
 
     String eid = "ff8080815dacd3a2015dacd3ef5c0000";
     String wxEid = "ca66a01b79474c40b3e7c7f93daf1a3b";
-//    String staffId = "e608b51b267e4943b87e222a343b4f25";
-    String staffId = "fb4096b75d524c5e943c036cb4079723";
+    String staffId = "e608b51b267e4943b87e222a343b4f25";
+//    String staffId = "fb4096b75d524c5e943c036cb4079723";
     String storeId = "ff8080816e216c04016e34294282004a";
     String clerkId = "300b60c7f8874ca2b9cc696ad6b6a480";
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/adaptor/MaterialDataAdaptor.java

@@ -176,10 +176,13 @@ public class MaterialDataAdaptor {
         if (result.get("data") == null) {
             return new Page<>();
         }
-
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(result.get("page")), JSONObject.class);
+        int totalCount = jsonObject.getIntValue("totalCount");
+        int totalPage = jsonObject.getIntValue("totalPage");
         List<MaterialClerkUsedDataVO> dataVOS = JSON.parseArray(JSON.toJSONString(result.get("data")), MaterialClerkUsedDataVO.class);
         Page<MaterialClerkUsedDataVO> pageResult = new Page<>();
-        pageResult.setTotalCount(1);
+        pageResult.setTotalCount(totalCount);
+        pageResult.setTotalPage(totalPage);
         pageResult.setResult(dataVOS);
         return pageResult;
     }
@@ -216,9 +219,13 @@ public class MaterialDataAdaptor {
             return new Page<>();
         }
 
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(result.get("page")), JSONObject.class);
+        int totalCount = jsonObject.getIntValue("totalCount");
+        int totalPage = jsonObject.getIntValue("totalPage");
         List<MaterialStoreUsedDataVO> dataVOS = JSON.parseArray(JSON.toJSONString(result.get("data")), MaterialStoreUsedDataVO.class);
         Page<MaterialStoreUsedDataVO> pageResult = new Page<>();
-        pageResult.setTotalCount(1);
+        pageResult.setTotalCount(totalCount);
+        pageResult.setTotalPage(totalPage);
         pageResult.setResult(dataVOS);
         return pageResult;
     }
@@ -276,7 +283,12 @@ public class MaterialDataAdaptor {
         if (result.get("data") == null) {
             return new Page<>();
         }
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(result.get("page")), JSONObject.class);
+        int totalCount = jsonObject.getIntValue("totalCount");
+        int totalPage = jsonObject.getIntValue("totalPage");
         Page<MaterialPersonalUsedDataVO> pageResult = new Page<>();
+        pageResult.setTotalCount(totalCount);
+        pageResult.setTotalPage(totalPage);
         List<MaterialPersonalUsedDataVO> materialPersonalUsedDataVos = JSON.parseArray(JSON.toJSONString(result.get("data")), MaterialPersonalUsedDataVO.class);
         if (CollectionUtils.isEmpty(materialPersonalUsedDataVos)) {
             return new Page<>();
@@ -286,7 +298,6 @@ public class MaterialDataAdaptor {
             materialPersonalUsedDataVo.setEndTime(endTime);
         }
         pageResult.setResult(materialPersonalUsedDataVos);
-        pageResult.setTotalCount(1);
         return pageResult;
     }
 
@@ -360,8 +371,12 @@ public class MaterialDataAdaptor {
             materialStoreUsedDataVO.setStartTime(startTime);
             materialStoreUsedDataVO.setEndTime(endTime);
         }
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(result.get("page")), JSONObject.class);
+        int totalCount = jsonObject.getIntValue("totalCount");
+        int totalPage = jsonObject.getIntValue("totalPage");
+        pageResult.setTotalCount(totalCount);
+        pageResult.setTotalPage(totalPage);
         pageResult.setResult(materialStoreUsedDataVOS);
-        pageResult.setTotalCount(1);
         return pageResult;
     }