场景修改

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

@@ -291,7 +291,7 @@ public class HomePageReportServiceImpl implements HomePageReportService {
         BigDecimal chlorine = homePageReportMapper.getWaterQualificationByMonth(localDate, 11, sceneId, "水源",
                 loginUser.getTenantId(), loginUser.getType(), loginUser.getPermissonType(), loginUser.getProgramItemList());
         //浊度
-        BigDecimal turbidity = homePageReportMapper.getWaterQualificationByMonth(localDate, 10, sceneId, "水源",
+        BigDecimal turbidity = homePageReportMapper.getWaterQualificationByMonth(localDate, 9, sceneId, "水源",
                 loginUser.getTenantId(), loginUser.getType(), loginUser.getPermissonType(), loginUser.getProgramItemList());
         //PH
         BigDecimal ph = homePageReportMapper.getWaterQualificationByMonth(localDate, 7, sceneId, "水源",
@@ -397,11 +397,11 @@ public class HomePageReportServiceImpl implements HomePageReportService {
                     value.stream().forEach(waterSupplyData -> {
                         waterSupplyChart.setSort(waterSupplyData.getDay());
 
-                        if (waterSupplyData.getParmType() == 3) { //供水
+                        if (waterSupplyData.getParmType() == 3&&waterSupplyData.getAmount()!=null) { //供水
                             waterSupplyChart.setWaterData(waterSupplyData.getAmount().divide(multipleData, 3, BigDecimal.ROUND_HALF_UP));
-                        } else if (waterSupplyData.getParmType() == 5) {//电耗
+                        } else if (waterSupplyData.getParmType() == 5&&waterSupplyData.getAmount()!=null) {//电耗
                             waterSupplyChart.setPowerData(waterSupplyData.getAmount().divide(multipleData, 3, BigDecimal.ROUND_HALF_UP));
-                        } else if (waterSupplyData.getParmType() == 6) {//药耗
+                        } else if (waterSupplyData.getParmType() == 6&&waterSupplyData.getAmount()!=null) {//药耗
                             waterSupplyChart.setDrugData(waterSupplyData.getAmount());
                         }
                     });