修改

sms_water/src/main/java/com/huaxu/controller/AppPageReportController.java

@@ -48,11 +48,9 @@ public class AppPageReportController {
         List<DeviceWaterSupply> intakeDayList = appPageReportService.deviceWaterReportForDay(companyOrgId,"水源",4, localDate.getDayOfMonth());
         List<DeviceWaterSupply> makingDayList = appPageReportService.deviceWaterReportForDay(companyOrgId,"水厂",3, localDate.getDayOfMonth());
         Map<String,Object> map = new HashMap<String,Object>();
-        map.put("intake", intakeWaterList);
-        map.put("making", makingWaterList);
+        map.put("intake", intakeDayList);
+        map.put("making", makingDayList);
         map.put("seller", sellerWaterList);
-        map.put("intakeDetail",intakeDayList);
-        map.put("makingkeDetail",makingDayList);
         appPageReportService.CalculationNrw(intakeWaterList,makingWaterList,sellerWaterList,map);
         return new AjaxMessage<>(ResultStatus.OK,map);
     }