修改

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

@@ -48,6 +48,6 @@ public class AppPageReportController {
         result.addAll(appPageReportService.deviceWaterReportForSameMonth(companyOrgId,"水源",4));
         result.addAll(appPageReportService.deviceWaterReportForSameMonth(companyOrgId,"水厂",3));
         result.addAll(appPageReportService.deviceSellerWaterReportForSameMonth(companyOrgId));
-        return new AjaxMessage<>(ResultStatus.OK,appPageReportService.deviceWaterReportForSameMonth(companyOrgId,"水源",4));
+        return new AjaxMessage<>(ResultStatus.OK,result);
     }
 }

sms_water/src/main/java/com/huaxu/service/impl/AppPageReportServiceImpl.java

@@ -78,7 +78,7 @@ public class AppPageReportServiceImpl implements AppPageReportService {
         BigDecimal AmountCountMonth = null;
         LocalDate localDate = LocalDate.now();
         List<DeviceWaterSupply> deviceWaterSupplies = new ArrayList<DeviceWaterSupply>();
-        List<MonthRevenueDto> sellerWater = revenueService.selectMonthRevenue(companyOrgId, localDate.getMonthValue());
+        List<MonthRevenueDto> sellerWater = revenueService.selectMonthRevenue(companyOrgId,1);
         if(sellerWater.size()>0){
             AmountCountMonth = new BigDecimal(sellerWater.get(0).getMeterReadingUsage());
         }