From 51852d8fab180c14927eb7e4c4c67347bbb3bcc4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 05 八月 2024 17:05:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
index 61890c6..fcd8e06 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -445,10 +445,10 @@
<if test = "rtuAddr != null and rtuAddr !=''">
AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
</if>
- <if test = "timeStart_open != null and timeStop_open != null">
+ <if test = "timeStart_open != null and timeStart_open != '' and timeStop_open != null and timeStop_open != '' ">
AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
</if>
- <if test = "timeStart_close != null and timeStop_close != null">
+ <if test = "timeStart_close != null and timeStart_close != '' and timeStop_close != null and timeStop_close != '' ">
AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
</if>
</where>
@@ -510,10 +510,10 @@
<if test = "rtuAddr != null and rtuAddr !=''">
AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
</if>
- <if test = "timeStart_open != null and timeStop_open != null">
+ <if test = "timeStart_open != null and timeStart_open != '' and timeStop_open != null and timeStop_open != '' ">
AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
</if>
- <if test = "timeStart_close != null and timeStop_close != null">
+ <if test = "timeStart_close != null and timeStart_close != '' and timeStop_close != null and timeStop_close != '' ">
AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
</if>
</where>
--
Gitblit v1.8.0