Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp

amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml

@@ -932,18 +932,14 @@
         (
         SELECT
         COUNT(
-
-        wespa.equipment_specific_id
-
+        	wespa.equipment_specific_id
         )
         FROM
         wl_equipment_specific_alarm_log wespa
         WHERE
-        wespa.equipment_specific_index_key LIKE concat('%', 'FireAlarm')
-        AND wespa.equipment_specific_index_value = 'true'
-        AND wespa.create_date BETWEEN #{startDate}
+        wespa.create_date BETWEEN #{startDate}
         AND #{endDate}
-        AND  wespa.equipment_id = (SELECT we.id FROM wl_equipment we WHERE we.category_id = (SELECT wec.id FROM wl_equipment_category wec WHERE wec.code = '92010600' ) )
+        AND  wespa.equipment_id in (SELECT we.id FROM wl_equipment we WHERE we.category_id = (SELECT wec.id FROM wl_equipment_category wec WHERE wec.code = '92010600' ) )
         <foreach collection="list" open="and (" close=")" item="code" index="index" separator="or">
             wespa.system_codes  like concat('%',#{code},'%')
         </foreach>
@@ -951,18 +947,13 @@
         (
         SELECT
         COUNT(
-
-        wespa.equipment_specific_id
-
+        	wespa.equipment_specific_id
         )
         FROM
         wl_equipment_specific_alarm_log wespa
-        WHERE
-        wespa.equipment_specific_index_key LIKE concat('%', 'FireAlarm')
-        AND wespa.equipment_specific_index_value = 'true'
-        AND wespa.create_date BETWEEN #{startDate}
+        WHERE wespa.create_date BETWEEN #{startDate}
         AND #{endDate}
-        AND  wespa.equipment_id = (SELECT we.id FROM wl_equipment we WHERE we.category_id = (SELECT wec.id FROM wl_equipment_category wec WHERE wec.code = '92010800' ) )
+        AND  wespa.equipment_id in (SELECT we.id FROM wl_equipment we WHERE we.category_id = (SELECT wec.id FROM wl_equipment_category wec WHERE wec.code = '92010800' ) )
         <foreach collection="list" open="and (" close=")" item="code" index="index" separator="or">
             wespa.system_codes  like concat('%',#{code},'%')
         </foreach>
@@ -970,18 +961,14 @@
         (
         SELECT
         COUNT(
-
-        wespa.equipment_specific_id
-
+        	wespa.equipment_specific_id
         )
         FROM
         wl_equipment_specific_alarm_log wespa
         WHERE
-        wespa.equipment_specific_index_key LIKE concat('%', 'Shield')
-        AND wespa.equipment_specific_index_value = 'true'
-        AND wespa.create_date BETWEEN #{startDate}
+        wespa.create_date BETWEEN #{startDate}
         AND #{endDate}
-        AND  wespa.equipment_id = (SELECT we.id FROM wl_equipment we WHERE we.category_id = (SELECT wec.id FROM wl_equipment_category wec WHERE wec.code = '92010500' ) )
+        AND  wespa.equipment_id in (SELECT we.id FROM wl_equipment we WHERE we.category_id = (SELECT wec.id FROM wl_equipment_category wec WHERE wec.code = '92010500' ) )
         <foreach collection="list" open="and (" close=")" item="code" index="index" separator="or">
             wespa.system_codes  like concat('%',#{code},'%')
         </foreach>