直流中心bug修改

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

@@ -1367,11 +1367,11 @@
     <select id="fireAlarmLogPage" resultType="java.util.HashMap">
         SELECT
         `wlesal`.id as alarmLogId,
-        equipment_specific_index_name,
-        equipment_specific_name,
+        `wlesal`.equipment_specific_index_name,
+        `wlesal`.equipment_specific_name,
         DATE_FORMAT(`wlesal`.`create_date`,'%m-%d %H:%i:%s') alarm_time,
-        location,
-        emergency_level_color,
+        wlesal.location,
+        wlesal.emergency_level_color,
         IF
         ( `wlesal`.`clean_time` IS NOT NULL, '已消除', '未消除' ) AS `cleanStatus`,
         wlesal.station_name AS sationName

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

@@ -5298,7 +5298,7 @@
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireWaterSys'
-                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' OR wesi.`status` = 0 AND wesi.`equipment_specific_index_value` = 'false' )
+                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' )
             ) fireWaterSys,
             (
                 SELECT
@@ -5310,7 +5310,7 @@
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireCAFSSys'
-                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' OR wesi.`status` = 0 AND wesi.`equipment_specific_index_value` = 'false' )
+                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' )
             ) fireCAFSSys,
             (
                 SELECT
@@ -5322,7 +5322,7 @@
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireAlarmSys'
-                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' OR wesi.`status` = 0 AND wesi.`equipment_specific_index_value` = 'false' )
+                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true'  )
             ) fireAlarmSys,
             (
                 SELECT
@@ -5334,7 +5334,7 @@
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireONLSys'
-                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' OR wesi.`status` = 0 AND wesi.`equipment_specific_index_value` = 'false' )
+                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' )
             ) fireONLSys
     </select>