修改导出bug

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

@@ -446,7 +446,7 @@
         END AS fireEquipmentPointValue,
         wlesal.type AS type,
         wlesal.create_date AS createDate,
-        wlesal.location AS warehouseStructureName,
+        CONCAT_WS(' ', ware.full_name, wsd.description ) AS warehouseStructureName,
         (
         SELECT
         group_concat(fet.`name`)
@@ -459,6 +459,8 @@
         FROM
         wl_equipment_specific_alarm_log wlesal
         LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id
+        LEFT JOIN wl_stock_detail as wsd on wsd.equipment_specific_id = wlesal.equipment_specific_id
+        LEFT JOIN wl_warehouse_structure as ware on wsd.warehouse_structure_id = ware.id
         ) d
         <where>
             <if test="warehouseStructureName != null and warehouseStructureName != ''">