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/TaskPlaceRectificationMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 f91b62a..a257b77 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml
@@ -492,7 +492,10 @@
<if test="taskPalce.id != null ">and jtpr.id = #{taskPalce.id}</if>
<if test="taskPalce.placeCheckId != null ">and jtpr.place_check_id = #{taskPalce.placeCheckId}</if>
<if test="taskPalce.taskId != null ">and jtpr.task_id = #{taskPalce.taskId}</if>
- <if test="taskPalce.status != null ">and jtpr.status = #{taskPalce.status}</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.taskName != null and taskPalce.taskName != ''">and jtpr.task_name =
#{taskPalce.taskName}
</if>
@@ -504,6 +507,14 @@
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!=''">
and jp.place_name like concat('%',#{taskPalce.placeName},'%')
</if>
--
Gitblit v1.9.3