From e9b990b1885c10d7b35f610a115feef56b3db016 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 03 Jul 2024 19:02:24 +0800
Subject: [PATCH] 代码优化

---
 src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 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 661f2b2..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,
@@ -224,6 +224,14 @@
             </if>
             <if test="taskPalce.endTime!=null and taskPalce.endTime!=''">
                 and jtpr.create_time&lt;=#{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