From 2f4d58a807ae1d91e43f7d7df33ce6b414c794ad Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 18 十月 2024 11:43:54 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
index 374bde2..8dd26db 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
@@ -13,10 +13,10 @@
EquipmentAlarm t1 LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
<where>
<if test="equipmentAlarmVo.equipmentId != null and equipmentAlarmVo.equipmentId != ''">
- AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
+ AND t1.EquipmentID LIKE '%' + #{equipmentAlarmVo.equipmentId} + '%'
</if>
<if test="equipmentAlarmVo.equipmentName != null and equipmentAlarmVo.equipmentName != ''">
- AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
+ AND t2.equipment_name LIKE '%' + #{equipmentAlarmVo.equipmentName} + '%'
</if>
<if test="equipmentAlarmVo.startTime != null and equipmentAlarmVo.endTime != null">
AND t1.collectTime BETWEEN #{equipmentAlarmVo.startTime} AND #{equipmentAlarmVo.endTime}
@@ -46,10 +46,10 @@
EquipmentAlarm t1 LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
<where>
<if test="equipmentAlarmVo.equipmentId != null and equipmentAlarmVo.equipmentId != ''">
- AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
+ AND t1.EquipmentID LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
</if>
<if test="equipmentAlarmVo.equipmentName != null and equipmentAlarmVo.equipmentName != ''">
- AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
+ AND t2.equipment_name LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
</if>
<if test="equipmentAlarmVo.startTime != null and equipmentAlarmVo.endTime != null">
AND t1.collectTime BETWEEN #{equipmentAlarmVo.startTime} AND #{equipmentAlarmVo.endTime}
@@ -67,4 +67,16 @@
, t1.EquipmentID DESC
</if>
</select>
+
+ <select id="equipmentAlarm" resultType="org.jeecg.modules.mdc.entity.EquipmentAlarm">
+ SELECT
+ t1.*
+ FROM
+ EquipmentAlarm t1
+ LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
+ LEFT JOIN mdc_production_equipment t3 ON t2.id = t3.equipment_id
+ WHERE
+ t3.production_id = #{productionId}
+ AND t1.collectTime BETWEEN #{startDate} AND #{endDate}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3