报表修改

sms_water/src/main/java/com/huaxu/service/DayReportService.java

@@ -139,16 +139,18 @@ public class DayReportService extends ServiceImpl<DayReportMapper, DayReportEnti
     }
     //计算固定的参数项
     private void calcUsage(ReportDto item, List<ReportDto> reportDtos) {
+        if(item==null||reportDtos.size()==0)
+            return;
         //固定参数项
         int index = -1;
         for (int i = 0; i < reportDtos.size(); i++) {
             if (reportDtos.get(i).getHour().equals(item.getHour()))
                 index = i;
         }
-        item.setYieldWaterUsage(reportDtos.get(index).getYieldWaterUsage());
-        item.setIntakeWaterUsage(reportDtos.get(index).getIntakeWaterUsage());
-        item.setPowerUsage(reportDtos.get(index).getPowerUsage());
-        item.setDrugUsage(reportDtos.get(index).getDrugUsage());
+        item.setYieldWaterUsage(reportDtos!=null&&reportDtos.get(index)!=null? reportDtos.get(index).getYieldWaterUsage():0);
+        item.setIntakeWaterUsage(reportDtos!=null&&reportDtos.get(index)!=null?reportDtos.get(index).getIntakeWaterUsage():0);
+        item.setPowerUsage(reportDtos!=null&&reportDtos.get(index)!=null?reportDtos.get(index).getPowerUsage():0);
+        item.setDrugUsage(reportDtos!=null&&reportDtos.get(index)!=null?reportDtos.get(index).getDrugUsage():0);
 //        if (index != -1) {
 //            if ((index + 2) <= reportDtos.size()) {
 //                item.setYieldWaterUsage(reportDtos.get(index).getYieldWaterUsage() - reportDtos.get(index + 1).getYieldWaterUsage());

sms_water/src/main/java/com/huaxu/service/MonthReportService.java

@@ -133,16 +133,18 @@ public class MonthReportService extends ServiceImpl<MonthReportMapper, MonthRepo
 
     //计算固定的参数项
     private void calcUsage(ReportDto item, List<ReportDto> reportDtos) {
+        if(item==null||reportDtos.size()==0)
+            return;
         //固定参数项
         int index = -1;
         for (int i = 0; i < reportDtos.size(); i++) {
             if (reportDtos.get(i).getDay().equals(item.getDay()))
                 index = i;
         }
-        item.setYieldWaterUsage(reportDtos.get(index).getYieldWaterUsage());
-        item.setIntakeWaterUsage(reportDtos.get(index).getIntakeWaterUsage());
-        item.setPowerUsage(reportDtos.get(index).getPowerUsage());
-        item.setDrugUsage(reportDtos.get(index).getDrugUsage());
+        item.setYieldWaterUsage(reportDtos!=null&&reportDtos.get(index)!=null? reportDtos.get(index).getYieldWaterUsage():0);
+        item.setIntakeWaterUsage(reportDtos!=null&&reportDtos.get(index)!=null?reportDtos.get(index).getIntakeWaterUsage():0);
+        item.setPowerUsage(reportDtos!=null&&reportDtos.get(index)!=null?reportDtos.get(index).getPowerUsage():0);
+        item.setDrugUsage(reportDtos!=null&&reportDtos.get(index)!=null?reportDtos.get(index).getDrugUsage():0);
 //        if (index != -1) {
 //            if ((index + 2) <= reportDtos.size()) {
 //                item.setYieldWaterUsage(reportDtos.get(index).getYieldWaterUsage() - reportDtos.get(index + 1).getYieldWaterUsage());

sms_water/src/main/java/com/huaxu/service/YearReportService.java

@@ -133,16 +133,19 @@ public class YearReportService extends ServiceImpl<YearReportMapper, YearReportE
     }
     //计算固定的参数项
     private void calcUsage(ReportDto item, List<ReportDto> reportDtos) {
+        if(item==null||reportDtos.size()==0)
+            return;
         //固定参数项
         int index = -1;
         for (int i = 0; i < reportDtos.size(); i++) {
             if (reportDtos.get(i).getMonth().equals(item.getMonth()))
                 index = i;
         }
-        item.setYieldWaterUsage(reportDtos.get(index).getYieldWaterUsage());
-        item.setIntakeWaterUsage(reportDtos.get(index).getIntakeWaterUsage());
-        item.setPowerUsage(reportDtos.get(index).getPowerUsage());
-        item.setDrugUsage(reportDtos.get(index).getDrugUsage());
+
+        item.setYieldWaterUsage(reportDtos!=null&&reportDtos.get(index)!=null? reportDtos.get(index).getYieldWaterUsage():0);
+        item.setIntakeWaterUsage(reportDtos!=null&&reportDtos.get(index)!=null?reportDtos.get(index).getIntakeWaterUsage():0);
+        item.setPowerUsage(reportDtos!=null&&reportDtos.get(index)!=null?reportDtos.get(index).getPowerUsage():0);
+        item.setDrugUsage(reportDtos!=null&&reportDtos.get(index)!=null?reportDtos.get(index).getDrugUsage():0);
 //        if (index != -1) {
 //            if ((index + 2) <= reportDtos.size()) {
 //                item.setYieldWaterUsage(reportDtos.get(index).getYieldWaterUsage() - reportDtos.get(index + 1).getYieldWaterUsage());