报表修改

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

@@ -125,11 +125,11 @@ public class DayReportService extends ServiceImpl<DayReportMapper, DayReportEnti
                 for (String key : mapsTitle.keySet()) {
                     Map<String, Object> map = new LinkedHashMap<>();
                     map.put("attributeName", mapData.get(key) == null ? key : mapData.get(key).getAttributeName());
-                    map.put("minValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getMinValue()*1000)/1000);
-                    map.put("maxValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getMaxValue()*1000)/1000);
-                    map.put("avgValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getAvgValue()*1000)/1000);
-                    map.put("sumValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getSumValue()*1000)/1000);
-                    map.put("latestValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getLatestValue()*1000)/1000);
+                    map.put("minValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getMinValue()==null ? "-" : (double)Math.round(mapData.get(key).getMinValue()*1000)/1000);
+                    map.put("maxValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getMaxValue()==null ? "-" : (double)Math.round(mapData.get(key).getMaxValue()*1000)/1000);
+                    map.put("avgValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getAvgValue()==null ? "-" : (double)Math.round(mapData.get(key).getAvgValue()*1000)/1000);
+                    map.put("sumValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getSumValue()==null ? "-" : (double)Math.round(mapData.get(key).getSumValue()*1000)/1000);
+                    map.put("latestValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getLatestValue()==null ? "-" : (double)Math.round(mapData.get(key).getLatestValue()*1000)/1000);
                     maps.add(map);
                 }
                 item.setDataMapValues(maps);

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

@@ -118,11 +118,11 @@ public class MonthReportService extends ServiceImpl<MonthReportMapper, MonthRepo
                 for (String key : mapsTitle.keySet()) {
                     Map<String, Object> map = new LinkedHashMap<>();
                     map.put("attributeName", mapData.get(key) == null ? key : mapData.get(key).getAttributeName());
-                    map.put("minValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getMinValue()*1000)/1000);
-                    map.put("maxValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getMaxValue()*1000)/1000);
-                    map.put("avgValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getAvgValue()*1000)/1000);
-                    map.put("sumValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getSumValue()*1000)/1000);
-                    map.put("latestValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getLatestValue()*1000)/1000);
+                    map.put("minValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getMinValue()==null ? "-" : (double)Math.round(mapData.get(key).getMinValue()*1000)/1000);
+                    map.put("maxValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getMaxValue()==null ? "-" : (double)Math.round(mapData.get(key).getMaxValue()*1000)/1000);
+                    map.put("avgValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getAvgValue()==null ? "-" : (double)Math.round(mapData.get(key).getAvgValue()*1000)/1000);
+                    map.put("sumValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getSumValue()==null ? "-" : (double)Math.round(mapData.get(key).getSumValue()*1000)/1000);
+                    map.put("latestValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getLatestValue()==null ? "-" : (double)Math.round(mapData.get(key).getLatestValue()*1000)/1000);
                     maps.add(map);
                 }
                 item.setDataMapValues(maps);

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

@@ -119,11 +119,11 @@ public class YearReportService extends ServiceImpl<YearReportMapper, YearReportE
                 for (String key : mapsTitle.keySet()) {
                     Map<String, Object> map = new LinkedHashMap<>();
                     map.put("attributeName", mapData.get(key) == null ? key : mapData.get(key).getAttributeName());
-                    map.put("minValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getMinValue()*1000)/1000);
-                    map.put("maxValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getMaxValue()*1000)/1000);
-                    map.put("avgValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getAvgValue()*1000)/1000);
-                    map.put("sumValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getSumValue()*1000)/1000);
-                    map.put("latestValue" + mapsTitle.get(key), mapData.get(key) == null ? "-" : (double)Math.round(mapData.get(key).getLatestValue()*1000)/1000);
+                    map.put("minValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getMinValue()==null ? "-" : (double)Math.round(mapData.get(key).getMinValue()*1000)/1000);
+                    map.put("maxValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getMaxValue()==null ? "-" : (double)Math.round(mapData.get(key).getMaxValue()*1000)/1000);
+                    map.put("avgValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getAvgValue()==null ? "-" : (double)Math.round(mapData.get(key).getAvgValue()*1000)/1000);
+                    map.put("sumValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getSumValue()==null ? "-" : (double)Math.round(mapData.get(key).getSumValue()*1000)/1000);
+                    map.put("latestValue" + mapsTitle.get(key), mapData.get(key) == null||mapData.get(key).getLatestValue()==null ? "-" : (double)Math.round(mapData.get(key).getLatestValue()*1000)/1000);
                     maps.add(map);
                 }
                 item.setDataMapValues(maps);