外部单位隐患处理修改

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/dao/entity/LatentDanger.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.Map;
 
 /**
  * @author keyong
@@ -187,7 +188,7 @@ public class LatentDanger extends BasicEntity {
     /**
      * 业务信息
      */
-    @TableField(typeHandler = JacksonTypeHandler.class)
+    @TableField(value = "biz_info", typeHandler = JacksonTypeHandler.class)
     private JSONObject bizInfo;
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/controller/LatentDangerController.java

@@ -379,4 +379,11 @@ public class LatentDangerController extends BaseController {
         return ResponseHelper.buildResponse(iLatentDangerService.getSupervisionReviewInfo(orgCode,
                 DateUtils.longStr2Date(t1), DateUtils.longStr2Date(t2)));
     }
+
+    @ApiOperation(value = "所有未完成隐患数量", notes = "所有未完成隐患数量")
+    @GetMapping(value = "/app/unFinishedDanger")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    public ResponseModel getUnFinishedDangerCountMap() {
+        return ResponseHelper.buildResponse(iLatentDangerService.getUnFinishedDangerCountMap());
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/dao/mapper/LatentDangerMapper.java

@@ -84,4 +84,7 @@ public interface LatentDangerMapper extends BaseMapper<LatentDanger> {
     IPage<LatentDanger> selectPageByParam(@Param("page") Page<LatentDanger> page, @Param("paramMap") Map<String, Object> paramMap);
 
     Integer selectUnFinishedCount(@Param("dangerState1") List<String> dangerState1, @Param("dangerState2") List<String> dangerState2);
+
+    Integer selectUnFinishedCountByParam(@Param("bizType") String bizType,
+                                         @Param("dangerState") List<String> dangerState);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -1222,12 +1222,17 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             latentDanger.setInstanceId((String) resultData.get("id"));
             latentDanger.setUpdateDate(new Date());
             if (PlanTypeEnum.OUTER.getCode().equals(bizInfo.getString("isOuter"))) { // 外部单位隐患直接到 安运部二次审核节点
-                // 保存日志信息
-                executeResultMsg = latentDanger.getDangerStateName() + ExecuteTypeEnum.通过.getName();
-                record =
-                        latentDangerFlowRecordService.getOne(new LambdaQueryWrapper<LatentDangerFlowRecord>().eq(LatentDangerFlowRecord::getDangerId, latentDanger.getId()));
                 latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.隐患二次审核确认.getCode());
                 latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.隐患二次审核确认.getName());
+
+                // 3、执行一步安运部二次审核
+                boolean executeResult = workflowExecuteService.excuteTask(latentDanger.getInstanceId(), planType);
+                if (!executeResult) {
+                    this.updateById(latentDanger);
+                    executeSubmitDto.setIsOk(false);
+                    executeSubmitDto.setMsg("任务执行失败");
+                    return executeSubmitDto;
+                }
             } else {
                 latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.现场确认.getCode());
                 latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.现场确认.getName());
@@ -1250,18 +1255,18 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                     executeSubmitDto.setMsg("设置节点执行人失败");
                     return executeSubmitDto;
                 }
-                // 5、保存日志信息
-                executeResultMsg = latentDanger.getDangerStateName() + ExecuteTypeEnum.通过.getName();
-                record = saveFlowRecord("", latentDanger.getDangerStateName(), userId, departmentId, latentDanger.getFlowJson(),
-                        latentDanger.getId(), reginParams.getRole(), executeResultMsg, "", userRealName, departmentName,
-                        latentDanger.getDangerState(), 0);
-                LatentDangerState.SupervisionDangerStateEnum curEnum =
-                        LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(latentDanger.getDangerState());
-                LatentDangerState.SupervisionDangerStateEnum nextEnum =
-                        LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(curEnum.getNext());
-                latentDanger.setDangerState(nextEnum.getCode());
-                latentDanger.setDangerStateName(nextEnum.getName());
             }
+            // 5、保存日志信息
+            executeResultMsg = latentDanger.getDangerStateName() + ExecuteTypeEnum.通过.getName();
+            record = saveFlowRecord("", latentDanger.getDangerStateName(), userId, departmentId, latentDanger.getFlowJson(),
+                    latentDanger.getId(), reginParams.getRole(), executeResultMsg, "", userRealName, departmentName,
+                    latentDanger.getDangerState(), 0);
+            LatentDangerState.SupervisionDangerStateEnum curEnum =
+                    LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(latentDanger.getDangerState());
+            LatentDangerState.SupervisionDangerStateEnum nextEnum =
+                    LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(curEnum.getNext());
+            latentDanger.setDangerState(nextEnum.getCode());
+            latentDanger.setDangerStateName(nextEnum.getName());
 
             latentDanger.setCurrentFlowRecordId(record.getId());
             this.updateById(latentDanger);
@@ -2354,4 +2359,27 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 
         return map;
     }
+
+    @Override
+    public Map<String,Integer> getUnFinishedDangerCountMap() {
+        Map<String, Integer> resultMap = Maps.newHashMap();
+        // 巡检隐患未关闭状态集合
+        List<LatentDangerState.PatrolDangerStateEnum> pDangerStateEnumList = Lists.newArrayList();
+        pDangerStateEnumList.add(LatentDangerState.PatrolDangerStateEnum.治理完毕);
+        pDangerStateEnumList.add(LatentDangerState.PatrolDangerStateEnum.待评审);
+        pDangerStateEnumList.add(LatentDangerState.PatrolDangerStateEnum.已撤销);
+        Integer pDangerCount =
+                this.baseMapper.selectUnFinishedCountByParam("patrol",
+                        pDangerStateEnumList.stream().map(LatentDangerState.PatrolDangerStateEnum::getCode).collect(Collectors.toList()));
+        resultMap.put("patrol", pDangerCount);
+        // 防火监督未关闭隐患状态集合
+        List<LatentDangerState.SupervisionDangerStateEnum> sDangerStateEnumList = Lists.newArrayList();
+        sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.未审核.getCode()));
+        sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode()));
+        sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.治理完毕.getCode()));
+        Integer sDangerCount = this.baseMapper.selectUnFinishedCountByParam("supervision",
+                sDangerStateEnumList.stream().map(LatentDangerState.SupervisionDangerStateEnum::getCode).collect(Collectors.toList()));
+        resultMap.put("supervision", sDangerCount);
+        return resultMap;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/intfc/ILatentDangerService.java

@@ -185,4 +185,11 @@ public interface ILatentDangerService {
      * @return
      */
     Object getSupervisionReviewInfo(String orgCode, Date t1, Date t2);
+
+    /**
+     * 获取所有未完成的隐患数量
+     *
+     * @return
+     */
+    Map<String, Integer> getUnFinishedDangerCountMap();
 }

amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -958,7 +958,10 @@
         WHERE
         pld.business_key = #{businessKey}
     </select>
-    <select id="selectPageByParam" resultType="com.yeejoin.amos.latentdanger.dao.entity.LatentDanger">
+    <resultMap id="selectPageByParamResult" type="com.yeejoin.amos.latentdanger.dao.entity.LatentDanger">
+        <result column="biz_info" property="bizInfo" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+    </resultMap>
+    <select id="selectPageByParam" resultMap="selectPageByParamResult">
         select
         *,
         CASE
@@ -966,7 +969,8 @@
         1
         ELSE
         0
-        END as overtimeState
+        END as overtimeState,
+        a.biz_info
         from p_latent_danger a
         <where>
             deleted = 0
@@ -1056,4 +1060,16 @@
         </if>
         ))
     </select>
+    <select id="selectUnFinishedCountByParam" resultType="java.lang.Integer">
+        SELECT COUNT(1)
+        FROM p_latent_danger
+        WHERE deleted = 0
+        AND biz_type = #{bizType}
+        <if test="dangerState != null and !dangerState.isEmpty()">
+            AND danger_state NOT IN
+            <foreach collection="dangerState" item="state" open="(" separator="," close=")">
+                #{state}
+            </foreach>
+        </if>
+    </select>
 </mapper>
\ No newline at end of file