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/TaskLabelReportingEventMapper.xml | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
index 51bc0ad..7efcc04 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
@@ -55,6 +55,14 @@
LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
LEFT JOIN blade_region br on br.code = jpag.community_code
where jtlre.is_deleted = 0
+ <if test="taskLabelReportingEvent.streetName != null and taskLabelReportingEvent.streetName != ''">
+ AND br.town_name like concat('%',#{taskLabelReportingEvent.streetName},'%')
+ </if>
+
+ <if test="taskLabelReportingEvent.communityName != null and taskLabelReportingEvent.communityName != ''">
+ AND br.village_name like concat('%',#{taskLabelReportingEvent.communityName},'%')
+ </if>
+
<if test="taskLabelReportingEvent.userId != null and taskLabelReportingEvent.userId != ''">
AND jtlre.user_id = #{taskLabelReportingEvent.userId}
</if>
@@ -86,6 +94,9 @@
</if>
<if test="taskLabelReportingEvent.principalPhone != null and taskLabelReportingEvent.principalPhone != ''">
AND jp.principal_phone like concat('%',#{taskLabelReportingEvent.principalPhone},'%')
+ </if>
+ <if test="taskLabelReportingEvent.startTime != null and taskLabelReportingEvent.startTime != '' and taskLabelReportingEvent.endTime != null and taskLabelReportingEvent.endTime != '' ">
+ AND jtlre.create_time BETWEEN #{taskLabelReportingEvent.startTime} and #{taskLabelReportingEvent.endTime}
</if>
<if test="taskLabelReportingEvent.roleName != null and taskLabelReportingEvent.roleName != ''">
<if test="taskLabelReportingEvent.roleName=='wgy'">
@@ -124,7 +135,7 @@
<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
and
(
- jg.grid_code in
+ jg.community_code in
<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
#{code}
</foreach>
@@ -289,9 +300,22 @@
LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
LEFT JOIN blade_region br on br.code = jpag.community_code
where jtlre.is_deleted = 0
+ <if test="taskLabelReportingEvent.streetName != null and taskLabelReportingEvent.streetName != ''">
+ AND br.town_name like concat('%',#{taskLabelReportingEvent.streetName},'%')
+ </if>
+
+ <if test="taskLabelReportingEvent.communityName != null and taskLabelReportingEvent.communityName != ''">
+ AND br.village_name like concat('%',#{taskLabelReportingEvent.communityName},'%')
+ </if>
+
<if test="taskLabelReportingEvent.userId != null and taskLabelReportingEvent.userId != ''">
AND jtlre.user_id = #{taskLabelReportingEvent.userId}
</if>
+
+ <if test="taskLabelReportingEvent.houseCode != null and taskLabelReportingEvent.houseCode != ''">
+ and jp.house_code = #{taskLabelReportingEvent.houseCode}
+ </if>
+
<if test="taskLabelReportingEvent.eventType != null and taskLabelReportingEvent.eventType != ''">
AND jtlre.event_type = #{taskLabelReportingEvent.eventType}
</if>
@@ -316,6 +340,9 @@
<if test="taskLabelReportingEvent.principalPhone != null and taskLabelReportingEvent.principalPhone != ''">
AND jp.principal_phone like concat('%',#{taskLabelReportingEvent.principalPhone},'%')
</if>
+ <if test="taskLabelReportingEvent.startTime != null and taskLabelReportingEvent.startTime != '' and taskLabelReportingEvent.endTime != null and taskLabelReportingEvent.endTime != '' ">
+ AND jtlre.create_time BETWEEN #{taskLabelReportingEvent.startTime} and #{taskLabelReportingEvent.endTime}
+ </if>
<if test="taskLabelReportingEvent.roleName != null and taskLabelReportingEvent.roleName != ''">
<if test="taskLabelReportingEvent.roleName=='wgy'">
<if test="isAdministrator==2">
--
Gitblit v1.9.3