告警列表无系统展示其他，统计无系统分到其他分类

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

@@ -1524,7 +1524,7 @@
         wlesa.location,
         date_format( wlesa.create_date, '%Y-%m-%d %H:%i:%s' ) createDate,
         wlesa.emergency_level_describe AS emergencyLevelDescribe,
-        fs.NAME AS systemName
+        IFNULL(fs.NAME, '其他系统') AS systemName
         FROM
         wl_equipment_specific_alarm_log wlesa
         LEFT JOIN wl_equipment_specific wes ON wes.id = wlesa.equipment_specific_id
@@ -1547,9 +1547,12 @@
             <if test="systemCode != null and systemCode != ''">
                 and fs.code = #{systemCode}
             </if>
-            <if test="systemType != null and systemType != ''">
+            <if test="systemType != null and systemType != ''  and systemType != 'outher' ">
                 and fs.system_type = #{systemType}
             </if>
+            <if test="systemType != null and systemType == 'outher'">
+                and fs.system_type_code IS NULL
+            </if>
             <if test="name != null and name != ''">
                 and wlesa.equipment_specific_name like concat('%', #{name},'%')
             </if>

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

@@ -7310,15 +7310,16 @@
 
     <select id="getSystemAlarmNum" resultType="Map">
         SELECT
-            fs.system_type AS `key`,
-            SUM(IF( wlesal.`status` IS NOT NULL, 1, 0 )) AS `value`,
-            wlec.`name` AS `name`
+            IFNULL(fs.system_type, 'outher') AS `key`,
+            SUM(IF(wlesal.`status` IS NOT NULL, 1, 0)) AS `value`,
+            IFNULL(wlec.`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
             LEFT JOIN wl_equipment_category wlec ON fs.system_type = wlec.id
         <where>
-            fs.system_type_code IS NOT NULL
+            1 = 1
+            -- fs.system_type_code IS NOT NULL
         <if test="bizOrgCode!=null and bizOrgCode!=''">
             AND wlesal.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
         </if>