|
|
@@ -235,7 +235,8 @@ public class IotRhDailyReportController {
|
|
|
@GetMapping("/statistics")
|
|
|
@Operation(summary = "获得瑞恒日报汇总统计")
|
|
|
@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<>();
|
|
|
// 根据查询参数筛选出 符合条件 的记录id 再传入 分页查询
|
|
|
Set<Long> projectIds = new HashSet<>();
|
|
|
@@ -264,7 +265,9 @@ public class IotRhDailyReportController {
|
|
|
}
|
|
|
List<IotRhDailyReportStatisticsRespVO> statistics = iotRhDailyReportService.statistics(pageReqVO);
|
|
|
result.addAll(statistics);
|
|
|
- return success(result);
|
|
|
+ resultMap.put("list", result);
|
|
|
+ resultMap.put("total", result.size());
|
|
|
+ return success(resultMap);
|
|
|
}
|
|
|
|
|
|
@GetMapping("/polylineStatistics")
|