From 6d08eec100243e0be59a207d57ab4db7974e51e4 Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期一, 29 七月 2024 15:26:26 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_yituo
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml | 8 ++++----
1 files changed, 4 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..b024828 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 CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
</if>
<if test="equipmentAlarmVo.equipmentName != null and equipmentAlarmVo.equipmentName != ''">
- AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
+ AND t1.EquipmentID LIKE CONCAT(CONCAT('%',#{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 t1.EquipmentID LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
</if>
<if test="equipmentAlarmVo.startTime != null and equipmentAlarmVo.endTime != null">
AND t1.collectTime BETWEEN #{equipmentAlarmVo.startTime} AND #{equipmentAlarmVo.endTime}
--
Gitblit v1.9.3