From 02f3b2a577143724b09a70cd13cd3e9256f5fc21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 12 Mar 2024 18:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
index 2fba7fb..7161490 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -211,8 +211,12 @@
<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.taskName != null and taskPalce.taskName != ''">and jtpr.task_name = #{taskPalce.taskName}
+ <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>
<if test="taskPalce.startTime!=null and taskPalce.startTime!=''">
@@ -260,7 +264,9 @@
<if test="taskPalce.rectificationCompleteTime != null ">and jtpr.rectification_complete_time =
#{taskPalce.rectificationCompleteTime}
</if>
- <if test="taskPalce.rectificationFlag != null ">and jtpr.rectification_flag = #{taskPalce.rectificationFlag}</if>
+ <if test="taskPalce.rectificationFlag != null ">and jtpr.rectification_flag =
+ #{taskPalce.rectificationFlag}
+ </if>
<if test="taskPalce.punishFlag != null ">and jtpr.punish_flag = #{taskPalce.punishFlag}</if>
<if test="taskPalce.policeStation != null and taskPalce.policeStation != ''">and jtpr.police_station =
#{taskPalce.policeStation}
@@ -295,7 +301,8 @@
<choose>
<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
and jpag.community_code in
- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
#{code}
</foreach>
</when>
@@ -478,7 +485,8 @@
<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.taskName != null and taskPalce.taskName != ''">and jtpr.task_name = #{taskPalce.taskName}
+ <if test="taskPalce.taskName != null and taskPalce.taskName != ''">and jtpr.task_name =
+ #{taskPalce.taskName}
</if>
<if test="taskPalce.startTime!=null and taskPalce.startTime!=''">
@@ -526,7 +534,9 @@
<if test="taskPalce.rectificationCompleteTime != null ">and jtpr.rectification_complete_time =
#{taskPalce.rectificationCompleteTime}
</if>
- <if test="taskPalce.rectificationFlag != null ">and jtpr.rectification_flag = #{taskPalce.rectificationFlag}</if>
+ <if test="taskPalce.rectificationFlag != null ">and jtpr.rectification_flag =
+ #{taskPalce.rectificationFlag}
+ </if>
<if test="taskPalce.punishFlag != null ">and jtpr.punish_flag = #{taskPalce.punishFlag}</if>
<if test="taskPalce.policeStation != null and taskPalce.policeStation != ''">and jtpr.police_station =
#{taskPalce.policeStation}
@@ -561,7 +571,8 @@
<choose>
<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
and jpag.community_code in
- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
#{code}
</foreach>
</when>
@@ -601,5 +612,14 @@
order by jtpr.create_time desc
</select>
+ <select id="getCount" resultType="java.lang.Integer">
+ SELECT count(1)
+ FROM jczz_task_place_rectification jtpr
+ LEFT JOIN jczz_place jp ON jp.house_code = jtpr.house_code
+ WHERE jp.jw_grid_code IN
+ (SELECT jpag.jw_grid_code FROM jczz_police_affairs_grid jpag WHERE jpag.police_user_id like concat('%',${userId},'%'))
+ AND jtpr.`status` = 1
+ </select>
+
</mapper>
--
Gitblit v1.9.3