Merge remote-tracking branch 'origin/master'

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

@@ -358,7 +358,7 @@
     <select id="MonitorDataQualityReportByDay" resultMap="MonitorDataChartReportMap">
         SELECT
         r.`HOUR` AS "dateLabel",
-        if(p.parm_type=8,'PH',if(p.parm_type=11,'余氯','浊度')) as  "attributeName",
+        if(p.parm_type=7,'PH',if(p.parm_type=11,'余氯','浊度')) as  "attributeName",
         s.SCENE_NAME AS "deviceName",
         p.parm_type AS "attributeType",
         da.unit AS "unit",
@@ -370,7 +370,7 @@
         left join sms_scene s on s.id=p.parent_scene_id
         left join sms_device_attribute  da ON da.id = p.ATTRIBUTE_ID
         LEFT JOIN sms_device d ON d.id = r.DEVICE_ID
-        WHERE p.`STATUS`= 1 and p.parm_type in (8,11,10) and d.ENABLE_STATE = 1
+        WHERE p.`STATUS`= 1 and p.parm_type in (7,11,9) and d.ENABLE_STATE = 1
         AND r.YEAR = #{year}  and r.month=#{month}  and r.day=#{day}
         <if test="sceneIds != null and sceneIds.size()>0">
             and p.PARENT_SCENE_ID in
@@ -414,7 +414,7 @@
     <select id="MonitorDataQualityReportByMonth" resultMap="MonitorDataChartReportMap">
         SELECT
         r.`day` AS "dateLabel",
-        if(p.parm_type=8,'PH',if(p.parm_type=11,'余氯','浊度')) as  "attributeName",
+        if(p.parm_type=7,'PH',if(p.parm_type=11,'余氯','浊度')) as  "attributeName",
         s.SCENE_NAME AS "deviceName",
         p.parm_type AS "attributeType",
         da.unit AS "unit",
@@ -426,7 +426,7 @@
         left join sms_scene s on s.id=p.parent_scene_id
         left join sms_device_attribute  da ON da.id = p.ATTRIBUTE_ID
         LEFT JOIN sms_device d ON d.id = r.DEVICE_ID
-        WHERE p.`STATUS`= 1 and p.parm_type in (8,11,10) and d.ENABLE_STATE = 1
+        WHERE p.`STATUS`= 1 and p.parm_type in (7,11,9) and d.ENABLE_STATE = 1
         AND r.YEAR = #{year}  and r.month=#{month}
         <if test="sceneIds != null and sceneIds.size()>0">
             and p.PARENT_SCENE_ID in
@@ -470,7 +470,7 @@
     <select id="MonitorDataQualityReportByYear" resultMap="MonitorDataChartReportMap">
         SELECT
         r.`month` AS "dateLabel",
-        if(p.parm_type=8,'PH',if(p.parm_type=11,'余氯','浊度')) as  "attributeName",
+        if(p.parm_type=7,'PH',if(p.parm_type=11,'余氯','浊度')) as  "attributeName",
         s.SCENE_NAME AS "deviceName",
         p.parm_type AS "attributeType",
         da.unit AS "unit",
@@ -482,7 +482,7 @@
         left join sms_scene s on s.id=p.parent_scene_id
         left join sms_device_attribute  da ON da.id = p.ATTRIBUTE_ID
         LEFT JOIN sms_device d ON d.id = r.DEVICE_ID
-        WHERE p.`STATUS`= 1 and p.parm_type in (8,11,10)
+        WHERE p.`STATUS`= 1 and p.parm_type in (7,11,9)
         AND r.YEAR = #{year} and d.ENABLE_STATE = 1
         <if test="sceneIds != null and sceneIds.size()>0">
             and p.PARENT_SCENE_ID in