制水量接口修改

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

@@ -1029,7 +1029,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                         Period period = Period.between(LocalDate.of(waterSupplyData.getYear(), waterSupplyData.getMonth(),1), LocalDate.now());
                         waterSupplyChart.setSort(period.getMonths()+1);
                         if (waterSupplyData.getParmType() == 3) { //供水
-                            waterSupplyChart.setWaterData(waterSupplyData.getAmount().divide(BigDecimal.valueOf(10000),2, RoundingMode.HALF_UP));
+                            waterSupplyChart.setWaterData(waterSupplyData.getAmount().divide(BigDecimal.valueOf(10000),3, RoundingMode.HALF_UP));
                         } else if (waterSupplyData.getParmType() == 5) {//电耗
                             waterSupplyChart.setPowerData(waterSupplyData.getAmount());
                         }
@@ -1040,7 +1040,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
         waterSupplyChart.setSort(1);
         waterSupplyChart.setDate(LocalDate.now().getYear()+"-"+LocalDate.now().getMonthValue());
         waterSupplyChart.setPowerData(powerDataAmountCountMonth);
-        waterSupplyChart.setWaterData(waterDataAmountCountMonth);
+        waterSupplyChart.setWaterData(waterDataAmountCountMonth.divide(BigDecimal.valueOf(10000),3, RoundingMode.HALF_UP));
         waterSupplyCharts.add(waterSupplyChart);
 
         waterSupplyCharts.sort(Comparator.comparing(WaterSupplyChart::getSort));