解决冲突

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

@@ -46,6 +46,7 @@
         <choose>
         	<when test="equipId != null and equipId != ''">
         		 ala.equipment_specific_id =#{equipId}
+        		 order by ala.create_date desc limit 1
         	</when>
         	<otherwise>
         	 	ala.id =#{id} limit 1

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

@@ -199,7 +199,7 @@
         AS fireEquipmentPointValue,
         wlesal.type AS type,
         wlesal.create_date AS createDate,
-        CONCAT_WS(' ',ware.full_name,wsd.description,wled.area) AS warehouseStructureName,
+        wlesal.location AS warehouseStructureName,
         (select
         group_concat(fet.`name`)
         from f_equipment_fire_equipment as fefe
@@ -209,7 +209,6 @@
         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
         LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id
         LEFT JOIN wl_equipment we ON wled.equipment_id = we.id
         ) d
@@ -266,11 +265,9 @@
         wlesa.equipment_specific_index_name AS fireEquipmentSpecificIndexName,
         wlesa.type AS type,
         wlesa.create_date AS createDate,
-        CONCAT_WS(' ',wws.full_name,wlsd.description) AS warehouseStructureName
+        wlesa.location AS warehouseStructureName
         FROM wl_equipment_specific_alarm_log wlesa
         left join wl_equipment_specific wles ON wlesa.equipment_specific_id = wles.id
-        left join wl_stock_detail wlsd ON wlsd.equipment_specific_id=wles.id
-        left join wl_warehouse_structure wws ON wlsd.warehouse_structure_id = wws.id
         ) d
         <where>
             <if test="warehouseStructureName != null and warehouseStructureName != ''">and d.warehouseStructureName like
@@ -337,7 +334,7 @@
         wlesal.create_date AS createDate,
         wlesal.build_id AS buildId,
         wlesa.recovery_date AS recoveryDate,
-        CONCAT_WS(' ',ware.full_name,wsd.description) AS warehouseStructureName,
+        wlesal.location AS warehouseStructureName,
         (
         SELECT
         group_concat(fet.`name`)
@@ -350,13 +347,8 @@
         FROM
         wl_equipment_specific_alarm_log wlesal
         LEFT JOIN wl_equipment we ON wlesal.equipment_code = we.code
-        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
+        LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id) d
+        WHERE
         <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">and
             d.warehouseStructureName like
             concat(concat("%",#{param.warehouseStructureName}),"%")
@@ -451,7 +443,7 @@
         END AS fireEquipmentPointValue,
         wlesal.type AS type,
         wlesal.create_date AS createDate,
-        CONCAT_WS(' ', ware.full_name, wsd.description ) AS warehouseStructureName,
+        wlesal.location  AS warehouseStructureName,
         (
         SELECT
         group_concat(fet.`name`)
@@ -464,8 +456,6 @@
         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 != ''">
@@ -765,7 +755,7 @@
         wlesa.`status`,
         wlesal.type AS type,
         wlesal.create_date AS createDate,
-        CONCAT_WS(' ',wws.full_name,wlsd.description) AS warehouseStructureName,
+        wlesal.location AS warehouseStructureName,
         (select
         group_concat(fet.`name`)
         from f_equipment_fire_equipment as fefe
@@ -776,7 +766,6 @@
         wl_equipment_specific_alarm_log wlesal
         LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id
         LEFT JOIN wl_stock_detail wlsd ON wlsd.equipment_specific_id = wles.id
-        LEFT JOIN wl_warehouse_structure wws ON wlsd.warehouse_structure_id = wws.id
         LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id
         LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id
         <where>
@@ -907,7 +896,7 @@
         wlesa.`status`,
         wlesal.type AS type,
         wlesal.create_date AS createDate,
-        CONCAT_WS(' ',wws.full_name,wlsd.description) AS warehouseStructureName,
+        wlesal.location AS warehouseStructureName,
         wlesal.confirm_user_name confirmUserName,
         wlesal.system_ids systemIds,
         (select
@@ -924,7 +913,6 @@
         wl_equipment_specific_alarm_log wlesal
         LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id
         LEFT JOIN wl_stock_detail wlsd ON wlsd.equipment_specific_id = wles.id
-        LEFT JOIN wl_warehouse_structure wws ON wlsd.warehouse_structure_id = wws.id
         LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id
         LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id
         <where>