From 8f5aeec641d916806553ef9772d55e17e93db150 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 15 Jul 2024 18:28:39 +0800
Subject: [PATCH] 代码优化
---
src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 0fcb2ea..7efcc04 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
@@ -300,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>
@@ -327,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