From 7a1e4d9fe3fe2172d5c4fba524f17ffd73ffbb3e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 08 Jul 2024 10:39:26 +0800
Subject: [PATCH] 公安添加时间过滤
---
src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml
index 0f3d658..f91b62a 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml
@@ -193,8 +193,8 @@
jp.principal,
jp.principal_phone,
jp.nine_type,
- br.town_name,
- br.village_name,
+ br.town_name streetName,
+ br.village_name communityName,
bu.`name`,
jpe.legal_tel,
jpe.legal_person,
@@ -213,7 +213,7 @@
<if test="taskPalce.taskId != null ">and jtpr.task_id = #{taskPalce.taskId}</if>
<if test="taskPalce.status != null and taskPalce.status != 2 ">and jtpr.status = #{taskPalce.status}</if>
- <if test="taskPalce.status != null and taskPalce.status = 2 ">and jtpr.status in (2,3)</if>
+ <if test="taskPalce.status != null and taskPalce.status == 2 ">and jtpr.status in (2,3)</if>
<if test="taskPalce.taskName != null and taskPalce.taskName != ''">and jtpr.task_name =
#{taskPalce.taskName}
@@ -224,6 +224,14 @@
</if>
<if test="taskPalce.endTime!=null and taskPalce.endTime!=''">
and jtpr.create_time<=#{taskPalce.endTime}
+ </if>
+
+ <if test="taskPalce.streetName!=null and taskPalce.streetName!=''">
+ and br.town_name like concat('%',#{taskPalce.streetName},'%')
+ </if>
+
+ <if test="taskPalce.communityName!=null and taskPalce.communityName!=''">
+ and br.village_name like concat('%',#{taskPalce.communityName},'%')
</if>
<if test="taskPalce.placeName!=null and taskPalce.placeName!=''">
@@ -466,8 +474,8 @@
jp.principal,
jp.principal_phone,
jp.nine_type,
- br.town_name,
- br.village_name,
+ br.town_name streetName,
+ br.village_name communityName,
bu.`name`,
jpe.legal_tel,
jpe.legal_person,
--
Gitblit v1.9.3