Browse Source

综合调度水质修改

wangyangyang 4 years ago
parent
commit
9c881d49df
1 changed files with 4 additions and 4 deletions
  1. 4 4
      sms_water/src/main/resources/mapper/HomePageReportMapper.xml

+ 4 - 4
sms_water/src/main/resources/mapper/HomePageReportMapper.xml

@@ -115,13 +115,13 @@
     <select id="getPipeNetworkQualification" resultType="com.huaxu.dto.homePage.WaterQualityRate">
         select
             sum(alarmNumber ) as  "abnormal",
-            ROUND(sum(if(alarmNumber > 0 ,0,1))/if(count(1) != 0, count(1),1) * 100,2) as "averageQuality"
+            ROUND(sum(if(alarmNumber > 0 ,1,0))/if(count(1) != 0, count(1),1) * 100,2) as "averageQuality"
         from
         (
             select
                 s.id as "sceneId"
                 ,dp.DEVICE_ID as "deviceId"
-                ,count(ad.id) as  "alarmNumber"
+                ,if(count(ad.id)>0,1,0) as  "alarmNumber"
             from sms_scene_type pst
             left join sms_scene ps on ps.SCENE_TYPE_ID =pst.ID
             left join sms_scene s on s.PARENT_SCENE_ID =ps.ID
@@ -171,7 +171,7 @@
     <select id="getWaterQualification" resultType="com.huaxu.dto.homePage.WaterQualityRate">
         select
         sum(alarmNumber ) as  "abnormal",
-        ROUND(sum(if(alarmNumber > 0 ,0,1))/if(count(1) != 0, count(1),1) * 100,2) as "averageQuality"
+        ROUND(sum(if(alarmNumber > 0 ,1,0))/if(count(1) != 0, count(1),1) * 100,2) as "averageQuality"
         from (
             select
             s.id as "sceneId"
@@ -179,7 +179,7 @@
                 <foreach collection="parmTypes" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
-                and ad.id is not null,1,0) )>0,1,0 )AS "alarmNumber"
+                and ad.id is not null,1,0) )>0,1,0 ) AS "alarmNumber"
             from sms_scene_type st
             left join sms_scene s on s.SCENE_TYPE_ID =st.id and PARENT_SCENE_ID ='0'
             left join sms_device_parm dp on dp.PARENT_SCENE_ID =s.ID