From b8699d2f81784e6f9dd906adeebae6fdeab3f981 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 02 Feb 2024 17:14:59 +0800
Subject: [PATCH] 隐患场所统计

---
 src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 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 c13cb05..3ce4954 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -129,9 +129,11 @@
         br.village_name,
         bu.`name`,
         jpe.legal_tel,
-        jpe.legal_person
+        jpe.legal_person,
+        jt.remark reasonFailure
     FROM
         jczz_task_place_rectification jtpr
+        LEFT JOIN jczz_task jt on jt.id = jtpr.task_id
         LEFT JOIN jczz_place jp ON jtpr.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
@@ -175,7 +177,8 @@
         br.village_name,
         bu.`name`,
         jpe.legal_tel,
-        jpe.legal_person
+        jpe.legal_person,
+        jda.address_name
         FROM
         jczz_task_place_rectification jtpr
         LEFT JOIN jczz_place jp ON jtpr.house_code = jp.house_code
@@ -184,6 +187,7 @@
         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
         <where>
             <if test="taskPalce.id != null ">and id = #{taskPalce.id}</if>
             <if test="taskPalce.placeCheckId != null ">and place_check_id = #{taskPalce.placeCheckId}</if>
@@ -278,10 +282,12 @@
         bd.dict_value,
         (
         SELECT
-        count( 1 )
+        IFNULL(sum( jpc.hidden_danger_number ) ,0)
         FROM
-        jczz_place jp
+        jczz_place_check jpc
+        LEFT JOIN jczz_place jp ON jpc.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
         <where>
             <if test="isAdministrator==2">
                 <choose>
@@ -294,6 +300,10 @@
                 </choose>
             </if>
             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
+            )
         </where>
         ) number
         FROM
@@ -302,6 +312,7 @@
         bd.code = 'nineType'
         AND bd.is_sealed = 0
         AND bd.dict_key > 0
+        order by bd.sort asc
 
     </select>
 

--
Gitblit v1.9.3