From f6d7e1932b93891bcfef95ba33eabd74a6518a1c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 18:01:54 +0800
Subject: [PATCH] 消防检查优化

---
 src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml |   48 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 35 insertions(+), 13 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 204a577..880051a 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -118,7 +118,25 @@
 
     <select id="selectTaskPlaceRectificationById" parameterType="long" resultMap="TaskPlaceRectificationDTOResult">
         SELECT
-        jtpr.*,
+        jtpr.id,
+        jtpr.place_check_id,
+        jtpr.task_id,
+        jtpr.STATUS,
+        jtpr.task_name,
+        jtpr.remark,
+        jtpr.update_time,
+        jtpr.create_time,
+        jtpr.house_code,
+        jtpr.rectification_notice_flag,
+        jtpr.rectification_end_time,
+        jtpr.rectification_complete_time,
+        jtpr.rectification_flag,
+        jtpr.punish_flag,
+        jtpr.police_station,
+        jtpr.rectification_notice_img_url,
+        jtpr.signature_path,
+        jtpr.create_user,
+        jtpr.image_urls,
         jp.id jpid,
         jp.place_name,
         jp.location,
@@ -130,7 +148,8 @@
         bu.`name`,
         jpe.legal_tel,
         jpe.legal_person,
-        jt.remark reasonFailure
+        jt.remark reasonFailure,
+        jda.address_name
     FROM
         jczz_task_place_rectification jtpr
         LEFT JOIN jczz_task jt on jt.id = jtpr.task_id
@@ -139,6 +158,7 @@
         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 = jtpr.create_user
+        LEFT JOIN jczz_doorplate_address jda on jda.address_code=jtpr.house_code
     WHERE jtpr.task_id = #{taskId}
     </select>
 
@@ -194,6 +214,13 @@
             <if test="taskPalce.taskId != null ">and task_id = #{taskPalce.taskId}</if>
             <if test="taskPalce.status != null ">and status = #{taskPalce.status}</if>
             <if test="taskPalce.taskName != null  and taskPalce.taskName != ''">and task_name = #{taskPalce.taskName}
+            </if>
+
+            <if test="taskPalce.startTime!=null and taskPalce.startTime!=''">
+                and jtpr.create_time&gt;=#{taskPalce.startTime}
+            </if>
+            <if test="taskPalce.endTime!=null and taskPalce.endTime!=''">
+                and jtpr.create_time&lt;=#{taskPalce.endTime}
             </if>
 
             <if test="taskPalce.placeName!=null and taskPalce.placeName!=''">
@@ -322,15 +349,12 @@
             and jpr.state = '0'
             and jp.nine_type = bd.dict_key
             and br.town_code =#{code}
-            and jpc.create_time=(
-            SELECT MAX(create_time) FROM jczz_place_check where jpc.house_code=house_code
             <if test="taskPlaceRectification.startTime!=null and taskPlaceRectification.startTime!=''">
-                and create_time&gt;=#{taskPlaceRectification.startTime}
+                and jpc.create_time&gt;=#{taskPlaceRectification.startTime}
             </if>
             <if test="taskPlaceRectification.endTime!=null and taskPlaceRectification.endTime!=''">
-                and create_time&lt;=#{taskPlaceRectification.endTime}
+                and jpc.create_time&lt;=#{taskPlaceRectification.endTime}
             </if>
-            )
         </where>
         ) number
         FROM
@@ -380,7 +404,7 @@
         jtpr.signature_path,
         jtpr.create_user,
         jtpr.image_urls,
-        bd.dept_name,
+        jpag.pcs_name deptName,
         jp.id jpid,
         jp.place_name,
         jp.location,
@@ -401,8 +425,8 @@
         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 = jtpr.create_user
-        LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
-        LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
+        LEFT JOIN jczz_doorplate_address jda on jda.address_code=jtpr.house_code
+        LEFT JOIN jczz_police_affairs_grid jpag on jpag.community_code= jg.community_code
         <where>
             <if test="taskPalce.id != null ">and id = #{taskPalce.id}</if>
             <if test="taskPalce.placeCheckId != null ">and place_check_id = #{taskPalce.placeCheckId}</if>
@@ -471,9 +495,7 @@
                     </when>
                 </choose>
             </if>
-            and jtpr.create_time=(
-            SELECT MAX(create_time) FROM jczz_task_place_rectification where jtpr.house_code=house_code
-            )
+
         </where>
 
 

--
Gitblit v1.9.3