From 2b1a74f4faa5a00a294bdc6a6d956c2e009cf467 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 16 Apr 2024 15:32:09 +0800
Subject: [PATCH] 管理员过滤文章

---
 src/main/java/org/springblade/modules/task/mapper/TaskPlaceSelfCheckMapper.xml |   71 +++++++++++++++++++++++++----------
 1 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskPlaceSelfCheckMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskPlaceSelfCheckMapper.xml
index 4378795..381b8bb 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskPlaceSelfCheckMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskPlaceSelfCheckMapper.xml
@@ -224,25 +224,24 @@
 
     <select id="selectPatrolRecordList" parameterType="Long"
             resultType="org.springblade.modules.task.vo.TaskPlaceRecordVO">
-            select
-	        jpr.id,
-	        jpr.item_id,
-	        jpr.task_place_self_check_id,
-	        jpr.state,
-	        jpr.remark,
-	        jpr.image_urls,
-	        jpr.create_user,
-	        jpr.create_time,
-	        jpr.is_deleted,
-	        jpr.rectification_image_urls,
-	        jpr.rectification_remark,
-	        jpr.rectification_time,
-	        jpgi.items_name
-		from
-        	jczz_task_place_record  jpr
-            LEFT JOIN jczz_patrol_group_item jpgi on jpr.item_id= jpgi.id
-             where task_place_self_check_id = #{id}
-        </select>
+        select jpr.id,
+               jpr.item_id,
+               jpr.task_place_self_check_id,
+               jpr.state,
+               jpr.remark,
+               jpr.image_urls,
+               jpr.create_user,
+               jpr.create_time,
+               jpr.is_deleted,
+               jpr.rectification_image_urls,
+               jpr.rectification_remark,
+               jpr.rectification_time,
+               jpgi.items_name
+        from jczz_task_place_record jpr
+                 LEFT JOIN jczz_patrol_group_item jpgi on jpr.item_id = jpgi.id
+        where task_place_self_check_id = #{id}
+          and jpr.type = '1'
+    </select>
 
     <sql id="selectTaskPlaceSelfCheck">
     	select
@@ -489,8 +488,40 @@
         SELECT count(1)
         FROM jczz_task_place_self_check jtpsc
                  LEFT JOIN jczz_place jp ON jp.house_code = jtpsc.house_code
+                 LEFT JOIN jczz_grid jg on jg.grid_code=jp.grid_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},'%') )
+              (SELECT jpag.jw_grid_code FROM jczz_police_affairs_grid jpag WHERE jpag.police_user_id like concat('%',#{userId},'%') )
           AND jtpsc.`status` = 1
+          AND jg.community_code=#{neiCode}
+    </select>
+
+
+
+    <select id="getDetailByTaskId" resultType="org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity">
+            SELECT
+                jtpsc.*,
+                jp.id jpid,
+                jp.place_name,
+                jp.location,
+                jg.grid_name,
+                jp.principal,
+                jp.principal_phone,
+                br.town_name,
+                br.village_name,
+                bu.`name`,
+                jpe.legal_tel,
+                jpe.legal_person,
+                jt.remark reasonFailure,
+                jda.address_name
+            FROM
+                    jczz_task_place_self_check jtpsc
+                    LEFT JOIN jczz_task jt on jt.id = jtpsc.task_id
+                    LEFT JOIN jczz_place jp ON jtpsc.house_code = jp.house_code
+                    LEFT JOIN jczz_grid jg ON jg.grid_code = jp.grid_code
+                    LEFT JOIN blade_region br ON br.`code` = jg.community_code
+                    LEFT JOIN jczz_place_ext jpe ON jpe.place_id = jp.id
+                    LEFT JOIN blade_user bu ON bu.id = jtpsc.create_user
+                    LEFT JOIN jczz_doorplate_address jda on jda.address_code=jtpsc.house_code
+            WHERE jtpsc.task_id = #{taskId}
     </select>
 </mapper>

--
Gitblit v1.9.3