修稿告警监测告警数据统计查询bug

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

@@ -1450,6 +1450,7 @@
             LEFT JOIN wl_equipment_specific wes ON wes.id = wlesal.equipment_specific_id
             LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, wlesal.system_ids )
         <where>
+            fs.system_type_code IS NOT NULL
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 and wlesal.biz_org_code like concat(#{bizOrgCode},'%')
             </if>
@@ -1463,7 +1464,7 @@
                 AND DATE_FORMAT( #{endDate}, '%Y-%m-%d %H:%i:%s' ) >= wlesal.create_date
             </if>
             <if test="systemCode != null and systemCode != ''">
-                and fs.code = #{systemCode}
+                and fs.system_type = #{systemCode}
             </if>
             <if test="name != null and name != ''">
                 and wlesal.equipment_specific_name like concat('%', #{name},'%')

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

@@ -7208,13 +7208,14 @@
 
     <select id="getSystemAlarmNum" resultType="Map">
         SELECT
-        wlesal.id AS `key`,
-        SUM(IF( wlesal.`status` = 1, 1, 0 )) AS `value`,
-        fs.name AS `name`
+            fs.system_type AS `key`,
+            SUM(IF( wlesal.`status` = 1, 1, 0 )) AS `value`,
+            fs.name AS `name`
         FROM
-        wl_equipment_specific_alarm_log wlesal
-        LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, wlesal.system_ids ) <![CDATA[<>]]> 0
+            wl_equipment_specific_alarm_log wlesal
+            LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, wlesal.system_ids ) <![CDATA[<>]]> 0
         <where>
+            fs.system_type_code IS NOT NULL
         <if test="bizOrgCode!=null and bizOrgCode!=''">
             AND wlesal.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
         </if>