修复bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -252,8 +252,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                         || AlarmTypeEnum.PB.getCode().equals(type)) {
                     dataVO.setAlarmType(AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
                 }
-                dataVO.setAlarmContent(x.get("fireEquipmentName") + dataVO.getAlarmType());
-                dataVO.setHandleType(null == x.get("handleType") ? null : String.valueOf(x.get("handleType")));
+                dataVO.setAlarmContent(String.valueOf(x.get("alamContent")));
+                dataVO.setHandleType(null == x.get("handleType") ? null : ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType"))));
                 res.add(dataVO);
             });
         }

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

@@ -336,7 +336,7 @@
         wlesal.create_date AS createDate,
         wlesal.build_id AS buildId,
         wlesa.recovery_date AS recoveryDate,
-        wlesal.location AS warehouseStructureName,
+        CONCAT_WS(' ',ware.full_name,wsd.description) AS warehouseStructureName,
         (
         SELECT
         group_concat(fet.`name`)
@@ -349,7 +349,12 @@
         FROM
         wl_equipment_specific_alarm_log wlesal
         LEFT JOIN wl_equipment we ON wlesal.equipment_code = we.code
-        LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id) d
+        LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id
+        LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_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
+        LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id
+        ) d
         WHERE d.fireEquipmentName IS NOT NULL
         <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">and
             d.warehouseStructureName like