Browse Source

pms 汇总统计列表 添加 total 审批

zhangcl 1 day ago
parent
commit
a6e69a1129

+ 5 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/IotRhDailyReportController.java

@@ -235,7 +235,8 @@ public class IotRhDailyReportController {
     @GetMapping("/statistics")
     @GetMapping("/statistics")
     @Operation(summary = "获得瑞恒日报汇总统计")
     @Operation(summary = "获得瑞恒日报汇总统计")
     @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:query')")
     @PreAuthorize("@ss.hasPermission('pms:iot-rh-daily-report:query')")
-    public CommonResult<List<IotRhDailyReportStatisticsRespVO>> statistics(@Valid IotRhDailyReportPageReqVO pageReqVO) {
+    public CommonResult<Map<String, Object>> statistics(@Valid IotRhDailyReportPageReqVO pageReqVO) {
+        Map<String, Object> resultMap = new HashMap<>();
         List<IotRhDailyReportStatisticsRespVO> result = new ArrayList<>();
         List<IotRhDailyReportStatisticsRespVO> result = new ArrayList<>();
         // 根据查询参数筛选出 符合条件 的记录id 再传入 分页查询
         // 根据查询参数筛选出 符合条件 的记录id 再传入 分页查询
         Set<Long> projectIds = new HashSet<>();
         Set<Long> projectIds = new HashSet<>();
@@ -264,7 +265,9 @@ public class IotRhDailyReportController {
         }
         }
         List<IotRhDailyReportStatisticsRespVO> statistics = iotRhDailyReportService.statistics(pageReqVO);
         List<IotRhDailyReportStatisticsRespVO> statistics = iotRhDailyReportService.statistics(pageReqVO);
         result.addAll(statistics);
         result.addAll(statistics);
-        return success(result);
+        resultMap.put("list", result);
+        resultMap.put("total", result.size());
+        return success(resultMap);
     }
     }
 
 
     @GetMapping("/polylineStatistics")
     @GetMapping("/polylineStatistics")

+ 5 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/IotRyDailyReportController.java

@@ -145,7 +145,8 @@ public class IotRyDailyReportController {
     @GetMapping("/statistics")
     @GetMapping("/statistics")
     @Operation(summary = "获得瑞鹰日报汇总统计")
     @Operation(summary = "获得瑞鹰日报汇总统计")
     @PreAuthorize("@ss.hasPermission('pms:iot-ry-daily-report:query')")
     @PreAuthorize("@ss.hasPermission('pms:iot-ry-daily-report:query')")
-    public CommonResult<List<IotRyDailyReportStatisticsRespVO>> statistics(@Valid IotRyDailyReportPageReqVO pageReqVO) {
+    public CommonResult<Map<String, Object>> statistics(@Valid IotRyDailyReportPageReqVO pageReqVO) {
+        Map<String, Object> resultMap = new HashMap<>();
         List<IotRyDailyReportStatisticsRespVO> result = new ArrayList<>();
         List<IotRyDailyReportStatisticsRespVO> result = new ArrayList<>();
         // 根据查询参数筛选出 符合条件 的记录id 再传入 分页查询
         // 根据查询参数筛选出 符合条件 的记录id 再传入 分页查询
         Set<Long> projectIds = new HashSet<>();
         Set<Long> projectIds = new HashSet<>();
@@ -174,7 +175,9 @@ public class IotRyDailyReportController {
         }
         }
         List<IotRyDailyReportStatisticsRespVO> statistics = iotRyDailyReportService.statistics(pageReqVO);
         List<IotRyDailyReportStatisticsRespVO> statistics = iotRyDailyReportService.statistics(pageReqVO);
         result.addAll(statistics);
         result.addAll(statistics);
-        return success(result);
+        resultMap.put("list", result);
+        resultMap.put("total", result.size());
+        return success(resultMap);
     }
     }
 
 
     /**
     /**