修改4小查询脚本

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

@@ -1148,18 +1148,17 @@
         union all
           SELECT
             '异常' AS `name`,
-            COUNT( wlesa.equipment_specific_index_value = 'true' ) AS `value`
+            COUNT( DISTINCT wlesa.equipment_specific_id ) AS `value`
         FROM
             wl_equipment_specific_alarm wlesa
-            LEFT JOIN `wl_equipment_specific` `wles` ON `wlesa`.`equipment_specific_id` = `wles`.`id`
-            LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, wles.system_id )
+		LEFT JOIN wl_equipment_specific wes on wes.id = wlesa.equipment_specific_id
         <where>
-            wlesa.equipment_specific_index_value = 'true'
+           	wlesa.`status` = 1
             <if test="systemCode != null and systemCode != ''">
-                AND fs.code = #{systemCode}
+            	AND FIND_IN_SET( #{systemCode}, wlesa.system_codes )>0
             </if>
             <if test="bizOrgCode != null and bizOrgCode != ''">
-                AND wles.biz_org_code like concat (#{bizOrgCode},'%')
+                AND wes.biz_org_code like concat (#{bizOrgCode},'%')
             </if>
         </where>
     </select>

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

@@ -2557,16 +2557,15 @@
         FROM
         (
          SELECT
-        wed.`name` AS equipName,
-        wed.equipment_id AS equipmentId,
-        wed.`code` AS `code`
+        eq.`name` AS equipName,
+        eq.id AS equipmentId,
+        eq.`code` AS `code`
         FROM
-        wl_equipment_detail wed
-        LEFT JOIN wl_equipment_specific wes ON wed.id = wes.equipment_detail_id
+        wl_equipment_specific wes
+        LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
+        LEFT JOIN wl_equipment eq on eq.id = wed.equipment_id
         WHERE
         FIND_IN_SET( #{id}, wes.system_id ) > 0
-        GROUP BY
-        wed.equipment_id
         ) a
         LEFT JOIN wl_equipment_specific_alarm wesa ON wesa.equipment_id = a.equipmentId
         AND wesa.`status` = 1