Merge remote-tracking branch 'origin/master'

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

@@ -718,13 +718,13 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
         sceneNormalRate1.setTypeName("水质");
         //PH
         SceneNormalRate sceneNormalRate2 = monitorDataReportMapper.getQualificationForScene(tenantId, 8,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
-        sceneNormalRate1.setTypeName("PH");
+        sceneNormalRate2.setTypeName("PH");
         //浊度
         SceneNormalRate sceneNormalRate3 = monitorDataReportMapper.getQualificationForScene(tenantId, 10,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
-        sceneNormalRate1.setTypeName("浊度");
+        sceneNormalRate3.setTypeName("浊度");
         //余氯
         SceneNormalRate sceneNormalRate4 = monitorDataReportMapper.getQualificationForScene(tenantId, 11,loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
-        sceneNormalRate1.setTypeName("余氯");
+        sceneNormalRate4.setTypeName("余氯");
 
         SceneNormalRates.add(sceneNormalRate1);
         SceneNormalRates.add(sceneNormalRate2);

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

@@ -189,12 +189,7 @@
     <select id="MonitorDataEnergyReportByDay" resultMap="MonitorDataChartReportMap">
         SELECT
             r.`HOUR` AS "dateLabel",
-            <if test="sceneType != null and sceneType == 1">
-                IF( p.parm_type = 5, '耗电量','取水量'  ) AS "attributeName",
-            </if>
-            <if test="sceneType == null or sceneType == 0">
-                IF( p.parm_type = 5, '耗电量','用水量'  ) AS "attributeName",
-            </if>
+            IF( p.parm_type = 5, '耗电量', IF( p.parm_type = 4, '取水量', '用水量' ) ) AS "attributeName",
             s.SCENE_NAME AS "deviceName",
             p.parm_type AS "attributeType",
             da.unit AS "unit",