From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
index 4cfc2d6..a733f7c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
@@ -100,7 +100,7 @@
<where>
AND status = '22'
AND alarm = #{ alarmCode }
- AND (start_time <= #{ vo.endDate } AND end_time >= #{ vo.startDate })
+ AND (start_time <= #{ endDate } AND end_time >= #{ startDate })
AND equipment_id = #{ equipmentId }
</where>
</select>
@@ -114,7 +114,7 @@
<where>
AND status = '22'
AND alarm = #{ vo.alarmCode }
- AND (start_time <= #{ vo.endDate } AND end_time >= #{ vo.startDate })
+ AND (start_time <= #{ endDate } AND end_time >= #{ startDate })
<if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
AND equipment_id IN
<foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
--
Gitblit v1.9.3