Merge remote-tracking branch 'origin/master'

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

@@ -29,4 +29,17 @@ public class SceneNormalRate implements Serializable {
     @ApiModelProperty("名称")
     private String typeName;
 
+    public SceneNormalRate(){
+        this.abnormal = 0;
+        this.normal = 0;
+        this.normalRate = BigDecimal.ZERO;
+    }
+
+    public SceneNormalRate(String typeName){
+        this.abnormal = 0;
+        this.normal = 0;
+        this.normalRate = BigDecimal.ZERO;
+        this.typeName = typeName;
+    }
+
 }

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

@@ -715,17 +715,30 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
         List<SceneNormalRate> SceneNormalRates = new ArrayList<>();
         //水质
         SceneNormalRate sceneNormalRate1 = monitorDataReportMapper.getQualificationForScene(tenantId, -1,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
-        sceneNormalRate1.setTypeName("水质");
         //PH
         SceneNormalRate sceneNormalRate2 = monitorDataReportMapper.getQualificationForScene(tenantId, 8,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
-        sceneNormalRate2.setTypeName("PH");
         //浊度
         SceneNormalRate sceneNormalRate3 = monitorDataReportMapper.getQualificationForScene(tenantId, 10,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
-        sceneNormalRate3.setTypeName("浊度");
         //余氯
         SceneNormalRate sceneNormalRate4 = monitorDataReportMapper.getQualificationForScene(tenantId, 11,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
-        sceneNormalRate4.setTypeName("余氯");
 
+        if(sceneNormalRate1 == null){
+            sceneNormalRate1 =new SceneNormalRate();
+        }
+        if(sceneNormalRate2 == null){
+            sceneNormalRate2 =new SceneNormalRate();
+        }
+        if(sceneNormalRate3 == null){
+            sceneNormalRate3 =new SceneNormalRate();
+        }
+        if(sceneNormalRate4 == null){
+            sceneNormalRate4 =new SceneNormalRate();
+        }
+
+        sceneNormalRate1.setTypeName("水质");
+        sceneNormalRate2.setTypeName("PH");
+        sceneNormalRate3.setTypeName("浊度");
+        sceneNormalRate4.setTypeName("余氯");
         SceneNormalRates.add(sceneNormalRate1);
         SceneNormalRates.add(sceneNormalRate2);
         SceneNormalRates.add(sceneNormalRate3);

sms_water/src/main/resources/mapper/MonitorDataReportMapper.xml

@@ -1076,7 +1076,6 @@
             </if>
         </if>
 
-        group by dp.DEVICE_ID ,dp.ATTRIBUTE_ID,dp.PARM_TYPE
     </select>
     <select id="getDeviceWaterDetailForYear" resultType="java.math.BigDecimal">
         select
@@ -1115,7 +1114,6 @@
             </if>
         </if>
 
-        group by dp.DEVICE_ID ,dp.ATTRIBUTE_ID,dp.PARM_TYPE
 
     </select>