feat(inspection): 巡检填报分页查询

- 在 InspectionFillGroupFillController 中添加分页查询功能
- 新增 IPage、Page、InspectionFillVO等引用
- 修改 getInspectionFillGroupFill 方法，支持分页参数
- 优化查询结果，返回分页数据

@@ -716,15 +716,15 @@ public class PowerAnalysisNewServiceImpl implements IPowerAnalysisNewService {
     }
 
     @Override
-    public Map<String, Object> powerCutDownListByFac(String startTime, String endTime, String factoryId) {
+    public Map<String, Object> powerCutDownListByFac(String startTime, String endTime, String departId) {
         String departIds = BaseContextHandler.getDeparts();
         String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ", departIds,  startTime, endTime);
         String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds,  startTime, endTime);
         DecimalFormat df = new DecimalFormat("#.##");
         Map<String, Object> result = Maps.newHashMap();
-        List<Map<String, Object>> facLists = waterCountAnalysisNewMapper.queryFacLists(factoryId, departIds);
+        List<Map<String, Object>> facLists = waterCountAnalysisNewMapper.queryFacLists(departId, departIds);
         Map<String, List<Map<String, Object>>> tmp = Maps.newHashMap();
-        List<Map<String, Object>> data = powerAnalysisNewMapper.queryDataByCodeAndtime(startTime, endTime, factoryId, "'CSCOD','JSCOD','CSNH3N','JSNH3N','CSTN','JSTN','JSTP','CSTP'");
+        List<Map<String, Object>> data = powerAnalysisNewMapper.queryDataByCodeAndtime(startTime, endTime, departId, "'CSCOD','JSCOD','CSNH3N','JSNH3N','CSTN','JSTN','JSTP','CSTP'");
         Map<String, Map<String, Double>> tmpMap = Maps.newHashMap();
         if (data != null && data.size() > 0) {
             for (Map<String, Object> datum : data) {
@@ -738,7 +738,7 @@ public class PowerAnalysisNewServiceImpl implements IPowerAnalysisNewService {
             }
         }
         //耗电量和水量
-        List<Map<String, Object>> hdl = powerAnalysisNewMapper.queryHDLAndSL(dataViewName3a24, dataViewName2119, startTime, endTime, factoryId);
+        List<Map<String, Object>> hdl = powerAnalysisNewMapper.queryHDLAndSL(dataViewName3a24, dataViewName2119, startTime, endTime, departId);
         if (hdl != null && hdl.size() > 0) {
             for (Map<String, Object> objectMap : hdl) {
                 String factoryId1 = (String) objectMap.get("factoryId");

 package com.skua.modules.inspection.controller.web;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.skua.core.api.vo.Result;
+import com.skua.core.util.ConvertUtils;
 import com.skua.modules.inspection.service.IInspectionFillGroupFillService;
+import com.skua.modules.inspection.vo.InspectionFillVO;
 import com.skua.modules.inspection.vo.InspectionGroupFillUpdateListVO;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -35,12 +39,28 @@ public class InspectionFillGroupFillController {
      * @author Xie Chao，2021-08-14 10:26
      */
     @GetMapping("/getInspectionFillGroupFill")
-    public Result<List<Map<String, Object>>> getInspectionFillGroupFill(String groupName,String departId) {
-        Result<List<Map<String, Object>>> result = new Result<>();
+    public Result<IPage<Map<String, Object>>> getInspectionFillGroupFill(String groupName,String departId,
+                                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        Result<IPage<Map<String, Object>>> result = new Result<>();
+        Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
         try {
             List<Map<String, Object>> list = inspectionFillGroupFillService.getInspectionFillGroupFill(groupName,departId);
+            // 计算总数
+            long count = list.size();
+            if (pageNo * pageSize <= list.size()) {
+                list = list.subList(ConvertUtils.getInt((pageNo - 1) * pageSize), ConvertUtils.getInt(pageNo * pageSize));
+            } else {
+                list = list.subList(ConvertUtils.getInt((pageNo - 1) * pageSize), ConvertUtils.getInt(list.size()));
+            }
+            // 设置页数
+            page.setSize(page.getSize());
+            // 设置总数
+            page.setTotal(count);
+            // 设置数据
+            page.setRecords(list);
             result.setSuccess(true);
-            result.setResult(list);
+            result.setResult(page);
         } catch (Exception e) {
             e.printStackTrace();
             log.error("获取巡检填报组和填报项失败", e.getMessage());