From c8673cbde4538b109e43042dc93cf33c46dca37e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 31 十二月 2024 10:56:57 +0800
Subject: [PATCH] 每日排产计划修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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..ca5498a 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
@@ -8,15 +8,16 @@
t2.equipment_name,
t1.collectTime,
t1.AlarmNo,
- t1.AlarmContent
+ t1.AlarmContent,
+ t2.drive_type
FROM
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}
@@ -41,15 +42,16 @@
t2.equipment_name,
t1.collectTime,
t1.AlarmNo,
- t1.AlarmContent
+ t1.AlarmContent,
+ t2.drive_type
FROM
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}
@@ -67,4 +69,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