Merge branch 'develop_dl_bugfix_0723' of…

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

@@ -1504,10 +1504,8 @@
         wlesa.id,
         wlesa.biz_org_name AS bizOrgName,
         concat( wlesa.equipment_specific_name, wlesa.equipment_specific_index_name ) AS alamContent,
-        IF
-        ( wlesa.recovery_date IS NULL, '未确认', '已确认' ) handleStatus,
-        IF
-        ( wlesa.`status` = 0, '已消除', '未消除' ) cleanStatus,
+        IF (wlesa.confirm_type IS NULL, '未确认', '已确认') handleStatus,
+        IF (wlesa.clean_time IS NOT NULL, '已消除', '未消除' ) cleanStatus,
         wlesa.equipment_index_id AS fireEquipmentIndexId,
         fs.CODE AS systemCode,
         wlesa.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
@@ -1528,7 +1526,7 @@
         wlesa.emergency_level_describe AS emergencyLevelDescribe,
         fs.NAME AS systemName
         FROM
-        wl_equipment_specific_alarm wlesa
+        wl_equipment_specific_alarm_log wlesa
         LEFT JOIN wl_equipment_specific wes ON wes.id = wlesa.equipment_specific_id
         LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET(fs.id, wlesa.system_ids)
         <where>
@@ -1555,16 +1553,16 @@
                 and wlesa.equipment_specific_name like concat('%', #{name},'%')
             </if>
             <if test="cleanStatus != null and cleanStatus != '' and cleanStatus == 2">
-                and wlesa.status = 1
+                and wlesa.clean_time IS NULL
             </if>
             <if test="cleanStatus != null and cleanStatus != '' and cleanStatus == 1">
-                and wlesa.status = 0
+                and wlesa.clean_time IS NOT NULL
             </if>
             <if test="handleStatus != null and handleStatus != '' and handleStatus == 2">
-                and wlesa.recovery_date IS NULL
+                and wlesa.confirm_type IS NULL
             </if>
             <if test="handleStatus != null and handleStatus != '' and handleStatus == 1">
-                and wlesa.recovery_date IS NOT NULL
+                and wlesa.confirm_type IS NOT NULL
             </if>
             <if test="types != null">
                 <foreach collection="types" index="index" item="item" open="and (" separator=" OR " close=")">