From fd3776838d5c90d04f96d340ad4c7809ec50a909 Mon Sep 17 00:00:00 2001
From: Zangzhipeng <lybluers@163.com>
Date: Thu, 8 Aug 2024 13:59:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HighDangerController.java      | 10 +++++++-
 .../server_api/mapper/HighDangerMapper.java   |  2 ++
 .../resources/sql-mapper/ConfigMapper.xml     |  2 +-
 .../resources/sql-mapper/HighDangerMapper.xml | 23 ++++++++++++++-----
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
index 4098da4..964679c 100644
--- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
+++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
@@ -101,7 +101,7 @@ public class HighDangerController {
         // 分别插入两张表
         highDangerService.insertDanger(highDangerBase);
         highDangerService.insertDangerRoad(highDangerRoad);
-        return ServerResponse.ok();
+        return ServerResponse.ok(businessId);
     }
 
     /*
@@ -1026,6 +1026,14 @@ public class HighDangerController {
             String uuidString = uuid.toString().replace("-", "");
             details.setNid(uuidString);
             details.setBusinessId(manualInvestigation.getBusinessId());
+            details.setPcCount(manualInvestigation.getPcCount());
+
+            ThtDangerItems dangerItemsById = highDangerMapper.getDangerItemsById(details.getHdTerm());
+
+            details.setSmallCategory(dangerItemsById.getParentid());
+            ThtDangerItems dangerItemsById_f = highDangerMapper.getDangerItemsById(dangerItemsById.getParentid());
+
+            details.setBigCategory(dangerItemsById_f.getParentid());
             // 保存重点排查数据
             highDangerMapper.saveDangerExtra(details);
 
diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java
index 4f78bc9..cfb33db 100644
--- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java
+++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java
@@ -68,6 +68,8 @@ public interface HighDangerMapper{
 
     List<ThtDangerItems> getDangerItems();
 
+    ThtDangerItems getDangerItemsById(String id);
+
     void updateTemporary(String businessId);
 
     void updateDangerRoad(String hdFlag,String businessId,String pcCount);
diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml
index 8a80ed1..f25e83a 100644
--- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml
+++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml
@@ -13,7 +13,7 @@
     </select>
 
     <select id="getStreetCommunityById" resultType="com.hisense.hiatmp.server_api.model.StreetCommunity">
-        select DISTINCT * from tlv_street_community
+        select DISTINCT xqcode,xqname from tlv_street_community
         where
             1 = 1
             <if test="jdcode != null and jdcode != ''">
diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
index 4d6b7eb..ce9856b 100644
--- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
+++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
@@ -88,17 +88,20 @@
 
         UNION ALL
 
+--         待办总数
         SELECT 'InGovernance' AS status,count(*) AS count
         FROM tht_hidden_danger_base hdb
             LEFT JOIN tht_hidden_danger_road hdr
         ON hdb.business_id = hdr.business_id AND hdb.pc_count = hdr.pc_count
             LEFT JOIN department dp ON hdb.handle_dept = dp.cdepartmentid
             LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601' AND et.enumvalue = hdb.status
+        LEFT JOIN tht_timeline tt ON tt.business_id = hdb.business_id
         WHERE
         1 = 1
         AND hdb.status = '10'
         AND hdr.nid is not null
-        AND COALESCE(hdb.approve_status,'0')IN('0','-1')
+        AND tt.operator = #{nuserid}
+        AND COALESCE(hdb.approve_status,'0') not IN('0','-1') AND hdb.approve_status is not null
         <if test="cdepartmentid != null">
             AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
         </if>
@@ -178,11 +181,13 @@
         <![CDATA[
         AND NOW() >= COALESCE(hdb.pc_end_time, hdb.pc_start_time + INTERVAL '1 day' * tpc.param_value::INTEGER) - INTERVAL '3 day'
         AND  NOW() <= COALESCE ( hdb.pc_end_time, hdb.pc_start_time + INTERVAL '1 day' * tpc.param_value :: INTEGER )
-        and hdb.status = '10'
-        AND COALESCE(hdb.approve_status,'0') IN ( '0', '-1')
+        AND hdb.status = '10'
+        AND hdr.nid is not null
+        AND COALESCE(hdb.approve_status,'0')IN('0','-1')
         ]]>
 
         UNION ALL
+
         SELECT DISTINCT 'Delay' AS status, count(*) AS count
         FROM tht_hidden_danger_base hdb
             LEFT JOIN tht_param_config tpc ON tpc.param_code = 'THT_PC_ROAD_XT'
@@ -198,12 +203,12 @@
         </if>
         <![CDATA[
             AND NOW() >= COALESCE ( hdb.pc_end_time, hdb.pc_start_time + INTERVAL '1 day' * tpc.param_value :: INTEGER )
-            and hdb.status = '10'
-            AND COALESCE(hdb.approve_status,'0') IN ( '0', '-1')
+        AND hdb.status = '10'
+        AND hdr.nid is not null
+        AND COALESCE(hdb.approve_status,'0')IN('0','-1')
             ]]>
     </select>
 
-
     <!--    <select id="getHigDangerDealt" resultType="com.hisense.hiatmp.model.common.HighDangerBase">-->
     <!--        SELECT hdb.*,hdr.pc_type,hdr.pc_end_time as-->
     <!--        road_pc_end_time,hdr.belong_xq,hdr.xzjd,bs.section_name,bs.section_code-->
@@ -489,6 +494,12 @@
         FROM tht_danger_items
     </select>
 
+    <select id="getDangerItemsById" resultType="com.hisense.hiatmp.model.common.ThtDangerItems">
+        SELECT DISTINCT *
+        FROM tht_danger_items
+        WHERE id = #{id}
+    </select>
+
     <select id="isExtraExistence" resultType="com.hisense.hiatmp.model.common.HiddenDangerDTO">
         SELECT *
         FROM tht_hidden_danger_road_info