From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml | 10 ++++++++--
1 files changed, 8 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 73f27ae..5a71a03 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
@@ -33,6 +33,8 @@
<if test="residen.minors!=null and residen.minors ==1">
and TIMESTAMPDIFF(year, substring(jtrpa.id_card, 7, 8), now()) >= 18
</if>
+ <if test="residen.communityCode != null and residen.communityCode != ''"> and jg.community_code = #{residen.communityCode}</if>
+
<if test="residen.id != null ">and jtrpa.id = #{residen.id}</if>
<if test="residen.name != null and residen.name != ''">and jtrpa.name like CONCAT('%',#{residen.name},'%')</if>
<if test="residen.phone != null and residen.phone != ''">and jtrpa.phone like CONCAT('%',#{residen.phone},'%')</if>
@@ -40,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>
@@ -90,8 +95,8 @@
</if>
</if>
- order by jtrpa.create_time desc
</where>
+ order by jtrpa.create_time desc
</select>
@@ -105,6 +110,7 @@
<where>
and jtrpa.is_deleted = 0
<if test="neiCode != null and neiCode != ''"> and jg.community_code = #{neiCode}</if>
+ <if test="status != null and status != ''"> and jtrpa.confirm_flag = #{status}</if>
<if test="isAdministrator==2">
<!-- <if test="residen.roleType ==null ">-->
--
Gitblit v1.9.3