From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml
index 639cf6f..152e28f 100644
--- a/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/ChargeMachineOrderV1ServiceDaoImplMapper.xml
@@ -72,6 +72,10 @@
and t.start_time < #{queryTime}
and t.end_time > #{queryTime}
</if>
+ <if test="queryStartTime !=null and queryStartTime != ''">
+ and t.create_time < #{queryStartTime}
+ and t.create_time > #{queryEndTime}
+ </if>
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
@@ -198,6 +202,10 @@
<if test="endTime !=null and endTime != ''">
and t.end_time= #{endTime}
</if>
+ <if test="queryTime !=null and queryTime != ''">
+ and t.start_time < #{queryTime}
+ and t.end_time > #{queryTime}
+ </if>
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
--
Gitblit v1.8.0