修改临期报废设备列表bug

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

@@ -1821,13 +1821,14 @@
         SELECT
         `s`.`name` AS `equipName`,
         `si`.`equipment_index_key` AS `equipmentIndexKey`,
-        (CASE si.`value` WHEN 'true' THEN '是' WHEN 'false' THEN '否' ELSE concat(si.`value`, IFNULL(wei.unit, '')) END)
+        (CASE si.`value` WHEN 'true' THEN '是' WHEN 'false' THEN '否' ELSE concat(ifnull(si.`value`,'--'), IFNULL(wei.unit, '')) END)
         AS `value`,
         '' AS standardValue,
-        si.update_date AS `time`,
+        DATE_FORMAT( si.update_date, '%Y-%m-%d %H:%i:%s' )
+         AS `time`,
         `si`.`equipment_index_name` AS `equipmentIndexName`,
         `s`.`code` AS `code`,
-        a.`name` AS `areaName`,
+        ifnull(ed.area, '--') as  area,
         (SELECT
         group_concat( `fs`.`charge_person_name` SEPARATOR ',' )
         FROM
@@ -1844,7 +1845,7 @@
         0 <![CDATA[<>]]> find_in_set( `fs`.`id`, `s`.`system_id` ))) AS `fightSysName`
         FROM
         `wl_equipment_specific_index` `si` JOIN `wl_equipment_specific` `s`
-        LEFT JOIN wl_area a ON a.id = s.area_id
+        LEFT JOIN wl_equipment_detail ed  ON  s.equipment_detail_id = ed.id
         LEFT JOIN wl_equipment_index wei ON wei.id = si.equipment_index_id
         WHERE
         `si`.`equipment_specific_id` = `s`.`id` AND si.is_alarm = 0