From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
index 6ba79fd..5a71a03 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
@@ -42,7 +42,10 @@
<if test="residen.address != null and residen.address != ''">and jtrpa.address like CONCAT('%',#{residen.address},'%')</if>
<if test="residen.houseCode != null and residen.houseCode != ''">and jtrpa.house_code = #{residen.houseCode}</if>
<if test="residen.taskId != null ">and jtrpa.task_id = #{residen.taskId}</if>
- <if test="residen.createTime != null ">and jtrpa.create_time = #{residen.createTime}</if>
+
+ <if test="residen.startTime != null and residen.startTime != '' and residen.endTime != null and residen.endTime != '' ">
+ AND jtrpa.create_time BETWEEN #{residen.startTime} and #{residen.endTime}
+ </if>
<if test="residen.updateTime != null ">and jtrpa.update_time = #{residen.updateTime}</if>
<if test="residen.createUser != null ">and jtrpa.create_user = #{residen.createUser}</if>
<if test="residen.houseRentalId != null ">and jtrpa.house_rental_id = #{residen.houseRentalId}</if>
@@ -92,8 +95,8 @@
</if>
</if>
- order by jtrpa.create_time desc
</where>
+ order by jtrpa.create_time desc
</select>
--
Gitblit v1.9.3