修改bug

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

@@ -838,11 +838,15 @@
         d.fireEquipmentSpecificIndexName,
         d.createDate,
         d.`status`,
-        (CASE WHEN d.type='FIREALARM' THEN '火警'
-        WHEN d.type ='BREAKDOWN' THEN '故障'
-        WHEN d.type='SHIELD' THEN '屏蔽'
-        WHEN d.type='NOTICE' THEN '预警'
-        ELSE '' END) AS type,
+
+--         (CASE WHEN d.type='FIREALARM' THEN '火警'
+--         WHEN d.type ='BREAKDOWN' THEN '故障'
+--         WHEN d.type='SHIELD' THEN '屏蔽'
+--         WHEN d.type='NOTICE' THEN '预警'
+--         ELSE '' END) AS type,
+
+        (select type_name from wl_signal_classify  where type_code =d.type)AS type,
+
         d.confirmUserName,
         d.systemIds,
         d.confirmType,
@@ -894,7 +898,17 @@
         wlesal.resolve_result,
         wles.code
         FROM
-        wl_equipment_specific_alarm_log wlesal
+--         wl_equipment_specific_alarm_log wlesal
+
+        (SELECT *
+        FROM (
+        SELECT DISTINCT(s.id) tid, s.*  FROM `wl_equipment_specific_alarm_log` s
+        ORDER BY s.create_date DESC
+        ) t
+        GROUP BY t.`equipment_specific_id`)
+        wlesal
+
+
         LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id
         LEFT JOIN wl_stock_detail wlsd ON wlsd.equipment_specific_id = wles.id
         LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id