修改综合展示bug

sms_water/src/main/java/com/huaxu/dto/generalView/WaterSupplyChart.java

@@ -47,7 +47,14 @@ public class WaterSupplyChart implements Serializable {
         this.date= DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDate.now().plusDays(-i));
 
     }
+    public WaterSupplyChart ( Integer i,Integer type){
+        this.sort=i;
+        this.waterData=BigDecimal.ZERO;
+        this.powerData=BigDecimal.ZERO;
+        this.drugData=BigDecimal.ZERO;
+        this.date= DateTimeFormatter.ofPattern("yyyy-MM").format(LocalDate.now().plusMonths(-i));
 
+    }
     public WaterSupplyChart (Integer i,String dateString){
         this.sort=i;
         this.waterData=BigDecimal.ZERO;

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

@@ -1363,7 +1363,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
         waterSupplyCharts.sort(Comparator.comparing(WaterSupplyChart::getSort));
         for(int i=0;i<6;i++){
             if(i == waterSupplyCharts.size() || !waterSupplyCharts.get(i).getSort().equals(i+1)){
-                waterSupplyCharts.add(i,new WaterSupplyChart(i+1, LocalDate.now().getYear()+"-"+LocalDate.now().getMonthValue()));
+                waterSupplyCharts.add(i,new WaterSupplyChart(i+1, 1));
             }
         }
         waterSupplyCharts.sort(Comparator.comparing(WaterSupplyChart::getSort).reversed());