0807代码提交

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java

@@ -1,6 +1,8 @@
 package com.hisense.hiatmp.server_api.controller;
 
+import com.hisense.hiatmp.model.common.EnumRoadType;
 import com.hisense.hiatmp.model.dmr.LineInfo;
+import com.hisense.hiatmp.server_api.mapper.HighDangerMapper;
 import com.hisense.hiatmp.server_api.model.ModuleCustomConfig;
 import com.hisense.hiatmp.server_api.model.StreetCommunity;
 import com.hisense.hiatmp.server_api.service.IConfigService;
@@ -11,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Objects;
 
 @Slf4j
 @RestController
@@ -19,6 +22,9 @@ public class ConfigController extends HiatmpController {
     @Autowired
     private IConfigService configService;
 
+    @Autowired
+    HighDangerMapper highDangerMapper;
+
     @RequestMapping(value = "/getModuleCustomConfigList", method = RequestMethod.POST)
     public ServerResponse<List<ModuleCustomConfig>> getModuleCustomConfigList() {
         return ServerResponse.ok(configService.getModuleCustomConfigList());
@@ -29,7 +35,7 @@ public class ConfigController extends HiatmpController {
      */
     @GetMapping("/getStreetCommunityById")
     public ServerResponse<?> getStreetCommunityById(@RequestParam String xqcode,
-                                                    @RequestParam String jdcode
+                                                    @RequestParam(defaultValue = "") String jdcode
     ){
         StreetCommunity streetCommunity = configService.getStreetCommunityById(xqcode,jdcode);
         return ServerResponse.ok(streetCommunity);
@@ -62,6 +68,17 @@ public class ConfigController extends HiatmpController {
         log.info("/getDangerBaseData（排查第一页默认数据回显）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(),sectionCode);
         // 查询默认数据
         LineInfo dangerBaseData = configService.getDangerBaseData(sectionCode);
+
+        List<EnumRoadType> roadTypes = highDangerMapper.getRoadTypes();
+        if(dangerBaseData.getSectionType() != null){
+            for(EnumRoadType roadType : roadTypes){
+                if(Objects.equals(roadType.getEnumvalue(), dangerBaseData.getSectionType())){
+                    dangerBaseData.setSectionType(roadType.getEnumName());
+                    break;
+                }
+            }
+        }
+
         log.info("/getDangerBaseData（排查第一页默认数据回显）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(),sectionCode);
         return ServerResponse.ok(dangerBaseData);
     }

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java

@@ -111,6 +111,7 @@ public class HighDangerController {
     public ServerResponse<?> getHighStatusNum(@RequestParam String nuserid, HttpServletRequest request) {
         log.info("/getHighDangerStatusNum（查询各个状态的数据情况）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), nuserid);
         String cdepartmentid = null;
+        String departmentid = null;
         Operator operatorById = operatorMapper.getOperatorById(nuserid);
         if (operatorById != null) {
             cdepartmentid = operatorById.getCdepartmentid();
@@ -118,11 +119,12 @@ public class HighDangerController {
             return ServerResponse.error("未找到当前用户");
         }
 
-        // 取部门的前六位
-        String firstSixChars = cdepartmentid.substring(0, Math.min(cdepartmentid.length(), 6));
-        log.info("部门前6位为:{}",firstSixChars);
+        if(!Objects.equals(operatorById.getNlevel(), "2")){
+            // 取部门的前六位
+            departmentid = cdepartmentid.substring(0, Math.min(cdepartmentid.length(), 6));
+        }
 
-        List<HighDangerBaseNum> statusCounts = highDangerMapper.getStatusCounts(firstSixChars, nuserid);
+        List<HighDangerBaseNum> statusCounts = highDangerMapper.getStatusCounts(departmentid, nuserid);
         log.info("/getHighDangerStatusNum（查询各个状态的数据情况）接口数据返回,调用ip: {}, 出参:{}", request.getRemoteAddr(), statusCounts);
 
         return ServerResponse.ok(statusCounts);
@@ -136,11 +138,13 @@ public class HighDangerController {
                                           @RequestParam(defaultValue = "1") Integer pageNum,
                                           @RequestParam(defaultValue = "10") Integer pageSize,
                                           @RequestParam(defaultValue = "") String search,
+                                          @RequestParam(defaultValue = "") String approve,
                                           @RequestParam(defaultValue = "") String classification, // 1 已完成 2 个人上报 3 系统下发
                                           HttpServletRequest request
     ) {
         log.info("/getHigDangerDealt（查询首页各个状态的数据列表）接口被调用,调用ip: {}, 入参:{},{},{},{}", request.getRemoteAddr(), highDangerBaseVO, pageNum, pageSize, search);
         String cdepartmentid = null;
+        String departmentid = null;
         // 获取当前操作的对象，用于查找对应的部
         Operator operatorById = operatorMapper.getOperatorById(highDangerBaseVO.getNuserid());
         if (operatorById != null) {
@@ -149,16 +153,16 @@ public class HighDangerController {
             return ServerResponse.error("未找到当前用户");
         }
 
-        // 取部门的前六位
-        String firstSixChars = cdepartmentid.substring(0, Math.min(cdepartmentid.length(), 6));
-
-        log.info("部门前六位:{}", firstSixChars);
+        if(!Objects.equals(operatorById.getNlevel(), "2")){
+            // 取部门的前六位
+            departmentid = cdepartmentid.substring(0, Math.min(cdepartmentid.length(), 6));
+        }
 //        int termTime = Integer.parseInt(configureMapper.getTermTime());
 
         //Page<HighDangerBase> page = new Page<>(pageNum, pageSize);
         PageHelper.startPage(pageNum, pageSize);
         // 将要查询的状态和部门id查询数据库，获得隐患排查表
-        List<HighDangerBase> statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(), firstSixChars, search, highDangerBaseVO.getNuserid(), classification);
+        List<HighDangerBase> statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(), departmentid, search, highDangerBaseVO.getNuserid(), classification,approve);
 
         // 待办
         /*if("20".equals(highDangerBaseVO.getStatus())){
@@ -175,7 +179,7 @@ public class HighDangerController {
             int nearHour = base.getNearHour();
 
             // 审批状态添加
-            if(!Objects.equals(base.getApproveStatus(), "0") && !Objects.equals(base.getApproveStatus(), "-1")){
+            if(!Objects.equals(base.getApproveStatus(), "0") && !Objects.equals(base.getApproveStatus(), "-1") && !Objects.equals(base.getApproveStatus(),null)){
                 base.setEnumname(base.getEnumname() + "(审批)");
             }
 
@@ -976,7 +980,7 @@ public class HighDangerController {
         Date lastModDate = new Date();
         manualInvestigation.setLastModeDate(lastModDate);
 
-        // 保存轄區和街道
+        // 保存辖区和街道
         highDangerMapper.updateSectionCommunity(manualInvestigation.getBusinessId(), manualInvestigation.getXqcode(), manualInvestigation.getJdcode());
 
         // 第一页：基础数据
@@ -1100,7 +1104,7 @@ public class HighDangerController {
             return ServerResponse.ok("数据已暂存", manualInvestigation);
         } else {
             log.info("/saveManualInvestigation（保存 & 暂存人工排查）接口返回, 客户端ip: {}, 返回数据:{},{}", request.getRemoteAddr(), "数据已保存", manualInvestigation);
-            highDangerMapper.updateTemporary(manualInvestigation.getBusinessId(), "20");
+            highDangerMapper.updateTemporary(manualInvestigation.getBusinessId());
             //隐患项不为空时，修改tht_hidden_danger_road
             String hdFlag = "0";
             if (CollectionUtils.isNotEmpty(manualInvestigation.getDescribe())) {
@@ -1141,7 +1145,6 @@ public class HighDangerController {
 
     @GetMapping("/getRoadTypes")
     public ServerResponse<?> getRoadType() {
-
         List<EnumRoadType> roadTypes = highDangerService.getRoadTypes();
         return ServerResponse.ok(roadTypes);
     }

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java

@@ -21,7 +21,7 @@ public interface HighDangerMapper{
     List<HighDangerBaseNum> getStatusCounts(@Param("cdepartmentid") String cdepartmentid, @Param("nuserid") String nuserid);
 
     //
-    List<HighDangerBase> getHigDangerDealt(String status, String cdepartmentid, String search,String nuserId, String classification);
+    List<HighDangerBase> getHigDangerDealt(@Param("status") String status, @Param("cdepartmentid") String cdepartmentid,@Param("search") String search,@Param("nuserid")String nuserId, @Param("classification") String classification,@Param("approve") String approve);
 
     List<HighDangerBase> getHigDangerDying(String status, String cdepartmentid);
 
@@ -68,7 +68,7 @@ public interface HighDangerMapper{
 
     List<ThtDangerItems> getDangerItems();
 
-    void updateTemporary(String businessId, String temporary);
+    void updateTemporary(String businessId);
 
     void updateDangerRoad(String hdFlag,String businessId,String pcCount);
 

hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml

@@ -14,7 +14,12 @@
 
     <select id="getStreetCommunityById" resultType="com.hisense.hiatmp.server_api.model.StreetCommunity">
         select DISTINCT * from tlv_street_community
-        where xqcode = #{xqcode} and jdcode = #{jdcode}
+        where
+            1 = 1
+            <if test="jdcode != null and jdcode != ''">
+                AND jdcode = #{jdcode}
+            </if>
+            AND xqcode = #{xqcode}
     </select>
 
     <select id="getStreetCommunityByXq" resultType="com.hisense.hiatmp.server_api.model.StreetCommunity">

hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml

@@ -67,27 +67,41 @@
         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
-        WHERE hdr.belong_xq like concat(concat(#{cdepartmentid},'%'))
+        WHERE hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
 
         UNION ALL
 
-        SELECT 'UnderInvestigation' AS status, SUM(CASE WHEN hdb.status = '10' THEN 1 ELSE 0 END) AS count
+        SELECT 'UnderInvestigation' 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
-        WHERE hdr.belong_xq like concat(concat(#{cdepartmentid},'%'))
+        WHERE
+        1 = 1
+        AND hdb.status = '10'
+        AND hdr.nid is not null
+        AND hdb.approve_status in ('0','-1',null)
+        <if test="cdepartmentid != null">
+            AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
+        </if>
 
         UNION ALL
 
-        SELECT 'InGovernance' AS status, SUM(CASE WHEN hdb.status = '20' THEN 1 ELSE 0 END) AS count
+        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
-        WHERE hdr.belong_xq like concat(concat(#{cdepartmentid},'%'))
+        WHERE
+        1 = 1
+        AND hdb.status = '10'
+        AND hdr.nid is not null
+        AND COALESCE(hdb.approve_status,'0')IN('0','-1')
+        <if test="cdepartmentid != null">
+            AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
+        </if>
 
         UNION ALL
 
@@ -97,19 +111,25 @@
         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
-        WHERE hdr.belong_xq like concat(concat(#{cdepartmentid},'%'))
+        WHERE hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
 
         UNION ALL
 
-        SELECT 'Finished' AS status, SUM(CASE WHEN hdb.status = '20' THEN 1 ELSE 0 END) AS count
+        SELECT 'Finished' 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 hdr.belong_xq like concat(concat(#{cdepartmentid},'%'))
+        WHERE hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
         AND tt.operator = #{nuserid}
+        AND hdb.status = '10'
+        AND hdr.nid is not null
+        AND hdb.approve_status != '0' AND  hdb.approve_status != '-1'
+        <if test="cdepartmentid != null">
+            AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
+        </if>
 
         UNION ALL
 
@@ -119,7 +139,7 @@
         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
-        WHERE hdr.belong_xq like concat(concat(#{cdepartmentid},'%'))
+        WHERE hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
 
         UNION ALL
 
@@ -128,10 +148,17 @@
             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 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 hdr.belong_xq like concat(concat(#{cdepartmentid},'%'))
-          AND tt.operator = #{nuserid}
+        WHERE
+          tt.operator = #{nuserid}
+          AND tt.title = '隐患上报'
+          AND hdb.status = '10'
+          AND hdr.nid is not null
+            AND hdb.approve_status != '0' AND  hdb.approve_status != '-1'
+        <if test="cdepartmentid != null">
+            AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
+        </if>
 
         UNION ALL
 
@@ -143,11 +170,16 @@
             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
-        WHERE hdr.belong_xq like concat(concat(#{cdepartmentid},'%'))
+        WHERE
+        1 = 1
+        <if test="cdepartmentid != null">
+            AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
+        </if>
         <![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) - 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 hdb.status = '10'
+        AND COALESCE(hdb.approve_status,'0') IN ( '0', '-1')
         ]]>
 
         UNION ALL
@@ -159,10 +191,15 @@
             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
-        WHERE hdr.belong_xq like concat(concat(#{cdepartmentid},'%'))
+        WHERE
+        1 = 1
+        <if test="cdepartmentid != null">
+            AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
+        </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 hdb.status = '10'
+            AND COALESCE(hdb.approve_status,'0') IN ( '0', '-1')
             ]]>
     </select>
 
@@ -246,9 +283,18 @@
                     <if test="classification != ''">
                         LEFT JOIN tht_timeline tt ON tt.business_id = hdb.business_id
                     </if>
-              WHERE hdr.belong_xq like concat(concat(#{cdepartmentid},'%'))
-                AND hdb.status = #{status}
---                 AND nvl(hdb.Approve_Status,'0') in ('0','-1')
+              WHERE
+                hdb.status = #{status}
+                AND hdr.nid is not null
+              <if test="approve == 1">
+                  AND COALESCE(hdb.approve_status,'0')IN('0','-1')
+              </if>
+                <if test="approve == 2">
+                    AND COALESCE(hdb.approve_status,'0') not IN('0','-1') AND hdb.approve_status is not null
+                </if>
+                <if test="cdepartmentid != null and cdepartmentid != ''">
+                    AND hdr.belong_xq like concat(concat(#{cdepartmentid},'%'))
+                </if>
                 <if test="search != null and search != ''">
                     AND hdb.name like concat(concat('%',#{search}),'%')
                 </if>
@@ -509,8 +555,8 @@
     </update>
 
     <update id="updateTemporary">
-        update tht_hidden_danger_base
-        set status = #{temporary},last_mod_date = NOW()
+        update tht_hidden_danger_base set
+       last_mod_date = NOW(), approve_status = '1'
         where business_id = #{businessId}
     </update>
 

hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml

@@ -10,7 +10,7 @@
     </select>
 
     <select id="getOperatorById" resultType="com.hisense.hiatmp.model.common.Operator">
-        select o.*,d.cdepartmentname
+        select o.*,d.cdepartmentname,d.nlevel
         from operator o
         LEFT JOIN department d on o.cdepartmentid = d.cdepartmentid
         where o.nuserid = #{nuserid}

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Operator.java

@@ -29,4 +29,6 @@ public class Operator implements Serializable {
 
     private String cdepartmentname;
 
+    private String nlevel;
+
 }