隐患列表修改

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerProcessStateEnum.java

+package com.yeejoin.amos.latentdanger.common.enums;
+
+/**
+ * 隐患执行状态
+ *
+ * @author DELL
+ */
+public enum LatentDangerProcessStateEnum {
+
+    /**
+     * 未审核
+     */
+    未审核("未审核", "0"),
+    /**
+     * 待审核
+     */
+    待审核("待审核", "1"),
+    /**
+     * 待整改
+     */
+    待整改("待整改", "2"),
+    /**
+     * 待复核
+     */
+    待复核("待复核", "3"),
+    /**
+     * 治理完毕
+     */
+    治理完毕("治理完毕", "4");
+
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    LatentDangerProcessStateEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public static String getEnumName(String code) {
+        String name = "";
+        for(LatentDangerProcessStateEnum type: LatentDangerProcessStateEnum.values()) {
+            if (type.getCode()==code) {
+                name = type.getName();
+                break;
+            }
+        }
+        return name;
+    }
+
+    public static LatentDangerProcessStateEnum getByCode(String code) {
+        for (LatentDangerProcessStateEnum l : LatentDangerProcessStateEnum.values()) {
+            if (code.equals(l.getCode())) {
+                return l;
+            }
+        }
+        return null;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerState.java

@@ -35,51 +35,51 @@ public interface LatentDangerState {
         /**
          * 提交隐患
          */
-        提交隐患("提交隐患", "dangerSubmit", null, null, "未审核"),
+        提交隐患("提交隐患", "dangerSubmit", null, null, "0"),
         /**
          * 现场确认
          */
-        现场确认("现场确认", "onSiteConfirm", "leaderConfirm","onSiteConfirm", "审核中"),
+        现场确认("现场确认", "onSiteConfirm", "leaderConfirm","onSiteConfirm", "1"),
         /**
          * 检查组长确认
          */
-        检查组长确认("检查组长确认", "leaderConfirm", "secondConfirm","onSiteConfirm", "审核中"),
+        检查组长确认("检查组长确认", "leaderConfirm", "secondConfirm","onSiteConfirm", "1"),
         /**
          * 隐患二次审核确认
          */
-        隐患二次审核确认("隐患二次审核确认", "secondConfirm", "taskDispatch","onSiteConfirm", "审核中"),
+        隐患二次审核确认("隐患二次审核确认", "secondConfirm", "taskDispatch","onSiteConfirm", "1"),
         /**
          * 整改任务分配
          */
-        整改任务分配("整改任务分配", "taskDispatch", "governFileSubmit","", "整改中"),
+        整改任务分配("整改任务分配", "taskDispatch", "governFileSubmit","", "2"),
         /**
          * 提交整改资料
          */
-        提交整改资料("提交整改资料", "governFileSubmit", "governChargerConfirm","", "整改中"),
+        提交整改资料("提交整改资料", "governFileSubmit", "governChargerConfirm","", "2"),
         /**
          * 整改检查组长确认
          */
-        整改检查组长确认("整改检查组长确认", "governLeaderConfirm", "governChargerConfirm","governFileSubmit", "整改中"),
+        整改检查组长确认("整改检查组长确认", "governLeaderConfirm", "governChargerConfirm","governFileSubmit", "3"),
         /**
          * 整改检查负责人确认
          */
-        整改检查负责人确认("整改检查负责人确认", "governChargerConfirm", "governLeadershipConfirm","governFileSubmit", "整改中"),
+        整改检查负责人确认("整改检查负责人确认", "governChargerConfirm", "governLeadershipConfirm","governFileSubmit", "3"),
         /**
          * 整改检查分管领导确认(根据计划类型不同，分管领导确认完流程不同)
          */
-        整改检查分管领导确认("整改检查分管领导确认", "governLeadershipConfirm", "governLeaderReviewConfirm","governFileSubmit", "整改中"),
+        整改检查分管领导确认("整改检查分管领导确认", "governLeadershipConfirm", "governLeaderReviewConfirm","governFileSubmit", "3"),
         /**
          * 整改检查组长复查确认
          */
-        整改检查组长复查确认("整改检查组长复查确认", "governLeaderReviewConfirm", "governSecondReviewConfirm","governFileSubmit", "整改中"),
+        整改检查组长复查确认("整改检查组长复查确认", "governLeaderReviewConfirm", "governSecondReviewConfirm","governFileSubmit", "3"),
         /**
          * 整改二次审核确认
          */
-        整改二次审核确认("整改二次审核确认", "governSecondReviewConfirm", "endOfGovernance","governFileSubmit", "整改中"),
+        整改二次审核确认("整改二次审核确认", "governSecondReviewConfirm", "endOfGovernance","governFileSubmit", "3"),
         /**
          * 整改完毕
          */
-        整改完毕("整改完毕", "endOfGovernance", "","", "整改完毕");
+        整改完毕("整改完毕", "endOfGovernance", "","", "4");
 
         /**
          * 名称，描述

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

@@ -171,6 +171,9 @@ public class LatentDanger extends BasicEntity {
      */
     private String bizType;
 
+    @TableField(exist = false)
+    private String bizTypeName;
+
     /**
      * 经度
      */
@@ -205,4 +208,16 @@ public class LatentDanger extends BasicEntity {
      */
     @TableField(exist = false)
     private JSONObject flowJson;
+
+    /**
+     * 阶段状态
+     */
+    @TableField(exist = false)
+    private String processState;
+
+    /**
+     * 阶段状态名称
+     */
+    @TableField(exist = false)
+    private String processStateName;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/constants/Constants.java

@@ -16,16 +16,6 @@ public class Constants {
     public static final String DANGER_BIZ_TYPE_KEY= "danger_biz_type_key";
 
     /**
-     * 降序排列
-     */
-    public static final String DESC = "desc";
-
-    /**
-     * 升序排列
-     */
-    public static final String ASC = "asc";
-
-    /**
      * 构造方法
      */
     private Constants() {

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

 package com.yeejoin.amos.latentdanger.business.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo;
 import com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerNoticeBo;
 import com.yeejoin.amos.latentdanger.business.param.LatentDangerListParam;
@@ -70,4 +72,12 @@ public interface LatentDangerMapper extends BaseMapper<LatentDanger> {
     void updateCheckInputDangerState(@Param("id") Long id, @Param("code") int code);
 
     LatentDangerBo getByBusinessKey(@Param("businessKey") String businessKey);
+
+    /**
+     * 根据参数分页查询
+     *
+     * @param paramMap
+     * @return
+     */
+    IPage<LatentDanger> selectPageByParam(Page page, @Param("paramMap") Map<String, Object> paramMap);
 }

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

@@ -50,19 +50,7 @@ import com.yeejoin.amos.latentdanger.business.vo.DangerTimeAxisVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailRiskVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerListVo;
-import com.yeejoin.amos.latentdanger.common.enums.DangerHandleStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.DictTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.ExecuteStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.ExecuteTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerBizTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerExecuteTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerLevelEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerOvertimeStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerReformTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerState;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.OwerEnum;
+import com.yeejoin.amos.latentdanger.common.enums.*;
 import com.yeejoin.amos.latentdanger.common.remote.RemoteSpcService;
 import com.yeejoin.amos.latentdanger.common.remote.RemoteWebSocketServer;
 import com.yeejoin.amos.latentdanger.common.remote.RemoteWorkFlowService;
@@ -94,17 +82,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.yeejoin.amos.latentdanger.business.util.RandomUtil.buildOrderNo;
@@ -167,6 +145,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
     private WorkflowExcuteServiceImpl workflowExecuteService;
     @Autowired
     private WorkflowFeignService workflowFeignService;
+
+    // 有启动后执行现场确认的角色名称
     private String onSiteConfirmRole = "Person_charge_unit_fire_protection_supervision_inspection";
 
     @Autowired
@@ -208,7 +188,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         flowJson.put("photoUrls", latentDangerDto.getPhotoUrl());
         LatentDangerFlowRecord record = saveFlowRecord(instance.getString("id"), "提交隐患", userId, departmentId,
                 flowJson, dangerId, role, LatentDangerExecuteTypeEnum.填写隐患完成.getName(), latentDangerDto.getRemark(),
-                userRealName, departmentName, latentDanger.getDangerState());
+                userRealName, departmentName, latentDanger.getDangerState(), 0);
         latentDanger.setCurrentFlowRecordId(record.getId());
         latentDangerMapper.updateById(latentDanger);
         sendMessage(latentDanger, LatentDangerExecuteTypeEnum.填写隐患完成, null,
@@ -284,7 +264,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 // 第一次保存隐患提交记录
                 LatentDangerFlowRecord inputRecord = saveFlowRecord(instance.getString("id"), "提交隐患", userId, departmentId,
                         flowJson, latentDanger.getId(), role, LatentDangerExecuteTypeEnum.填写隐患完成.getName(),
-                        latentDanger.getRemark(), userRealName, departmentName, latentDanger.getDangerState());
+                        latentDanger.getRemark(), userRealName, departmentName, latentDanger.getDangerState(), 0);
                 latentDanger.setCurrentFlowRecordId(inputRecord.getId());
                 latentDanger.setInstanceId(instance.getString("id"));
                 latentDangerMapper.updateById(latentDanger);
@@ -373,8 +353,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             latentDanger.setOrgCode(orgCode);
             latentDanger.setDangerType(dangerTypeEnum.getCode());
             if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
-                latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.现场确认.getCode());
-                latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.现场确认.getName());
+                latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
+                latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName());
             } else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
                 latentDanger.setDangerState(LatentDangerState.PatrolDangerLevelEnum.待评审.getCode());
                 latentDanger.setDangerStateName(LatentDangerState.PatrolDangerLevelEnum.待评审.getName());
@@ -393,7 +373,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
     public LatentDangerFlowRecord saveFlowRecord(String taskId, String taskName, String userId, String departmentId,
                                                  JSONObject flowJson, Long dangerId, RoleBo role,
                                                  String executeResult, String remark, String userName,
-                                                 String departmentName, String dangerState) {
+                                                 String departmentName, String dangerState, Integer executeState) {
         LatentDangerFlowRecord record = new LatentDangerFlowRecord();
         record.setFlowTaskId(taskId);
         record.setExecuteUserId(userId);
@@ -403,6 +383,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         record.setFlowJson(flowJson != null ? flowJson.toJSONString() : null);
         record.setFlowTaskName(taskName);
         record.setDangerId(dangerId);
+        record.setExecuteState(executeState);
         record.setExecuteResult(executeResult);
         record.setActionFlag(dangerState);
         record.setRemark(remark);
@@ -1148,9 +1129,15 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             return executeSubmitDto;
         }
         String planType = bizInfo.get("planType").toString();
+        String amosUserId = jcsFeignClient.getAmosIdByUserId((String) bizInfo.get("accompanyingUserId")).getResult();
+        if (ValidationUtil.isEmpty(amosUserId)) {
+            executeSubmitDto.setIsOk(false);
+            executeSubmitDto.setMsg("业务信息错误");
+            return executeSubmitDto;
+        }
         // TODO 修改
-        //jcsFeignClient.getAmosIdByUserId(bizInfo.get("accompanyingUserId")
-        AgencyUserModel userModel = Privilege.agencyUserClient.queryByUserId("3400882").getResult();
+        amosUserId = "3400882";
+        AgencyUserModel userModel = Privilege.agencyUserClient.queryByUserId(amosUserId).getResult();
         String checkLeaderId = userModel.getUserName();
 
         String processInstanceId = latentDanger.getInstanceId();
@@ -1210,7 +1197,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             executeResultMsg = latentDanger.getDangerStateName() + ExecuteTypeEnum.通过.getName();
             record = saveFlowRecord("", latentDanger.getDangerStateName(), userId, departmentId, latentDanger.getFlowJson(),
                     latentDanger.getId(), reginParams.getRole(), executeResultMsg, "", userRealName, departmentName,
-                    latentDanger.getDangerState());
+                    latentDanger.getDangerState(), 0);
             LatentDangerState.SupervisionDangerStateEnum curEnum =
                     LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(latentDanger.getDangerState());
             LatentDangerState.SupervisionDangerStateEnum nextEnum =
@@ -1318,7 +1305,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 
         record = saveFlowRecord("", currentStateEnum.getName(), userId, departmentId, latentDanger.getFlowJson(),
                 latentDanger.getId(), reginParams.getRole(), executeResultMsg, "", userRealName, departmentName,
-                currentStateEnum.getCode());
+                currentStateEnum.getCode(), param.getExecuteType());
         latentDanger.setCurrentFlowRecordId(record.getId());
         this.updateById(latentDanger);
 
@@ -1377,16 +1364,16 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             latentDanger.setDangerState(executeTypeEnum.getNextState().getCode());
             saveFlowRecord(executeJson.getString("id"), data.getString("name"), userId, departmentId,
                     param.getFlowJson(), param.getDangerId(), reginParams.getRole(), executeTypeEnum.getName(),
-                    param.getRemark(), userRealName, departmentName, latentDanger.getDangerState());
+                    param.getRemark(), userRealName, departmentName, latentDanger.getDangerState(), 0);
         } else if (executeTypeEnum.getNextState().equals(LatentDangerStateEnum.治理完毕)) {
             latentDanger.setDangerState(executeTypeEnum.getNextState().getCode());
             saveFlowRecord(executeJson.getString("id"), data.getString("name"), userId, departmentId,
                     param.getFlowJson(), param.getDangerId(), reginParams.getRole(), executeTypeEnum.getName(),
-                    param.getRemark(), userRealName, departmentName, latentDanger.getDangerState());
+                    param.getRemark(), userRealName, departmentName, latentDanger.getDangerState(), 0);
         } else {
             LatentDangerFlowRecord flowRecord = saveFlowRecord(executeJson.getString("id"), data.getString("name"), userId, departmentId,
                     param.getFlowJson(), param.getDangerId(), reginParams.getRole(), executeTypeEnum.getName(),
-                    param.getRemark(), userRealName, departmentName, latentDanger.getDangerState());
+                    param.getRemark(), userRealName, departmentName, latentDanger.getDangerState(), 0);
             latentDanger.setCurrentFlowRecordId(flowRecord.getId());
             latentDanger.setDangerState(executeTypeEnum.getNextState().getCode());
             if (executeTypeEnum.equals(LatentDangerExecuteTypeEnum.隐患常规治理)) {
@@ -1717,16 +1704,14 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 
     @Override
     public IPage<LatentDanger> pageListDanger(PageParam pageParam) throws Exception {
-        Page<LatentDanger> page = new Page<>(Long.parseLong((String) pageParam.get("current")),
-                Long.parseLong((String) pageParam.get("size")));
         List allTaskList;
-        String order = Constants.ASC;
         String idsStr = (String) pageParam.get("dangerIds");
         List<String> dangerIdList = Lists.newArrayList();
         if (StringUtil.isNotEmpty(idsStr)) {
             // 查询指定隐患
             dangerIdList = Lists.newArrayList(idsStr.split(","));
-        } else if (OwerEnum.MY.getCode().equals(pageParam.get("my"))) {
+        }
+        if (OwerEnum.MY.getCode().equals(pageParam.get("my"))) {
             // 不指定隐患id-我的任务
             JSONObject allTaskResult = workflowFeignService.getCurrentUserAllTaskList(workflowProcessDefinitionKey);
             allTaskList = (List) allTaskResult.get("data");
@@ -1740,7 +1725,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 dangers.forEach(d -> finalDangerIdList.add(d.getId().toString()));
             }
 
-            // 没设置隐患状态，说明查询 我的任务 或 所有是 提交隐患 状态的任务
+            // 没设置隐患状态，说明查询 '我的任务' 或 所有是 '提交隐患' 状态的任务
             if (ValidationUtil.isEmpty(pageParam.get("dangerState"))) {
                 if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
                     pageParam.put("dangerState", LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
@@ -1751,38 +1736,28 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         }
         // 获取隐患地点的子节点
         Object structureId = pageParam.get("structureId");
-        List<Long> structureIdList = Lists.newArrayList();
+        List<Long> structureIdList;
         if (structureId != null && structureId.toString().trim().length() > 0) {
             ResponseModel<Object> response = equipFeign.getBuildingTree();
             List<Map<String, Object>> buildingTree = (List<Map<String, Object>>) response.getResult();
             Map<String, Object> node = getAllNodes(buildingTree).stream().filter(map -> structureId.equals(map.get("id"))).findFirst().orElse(null);
             if (node != null) {
                 structureIdList = findBuildChildrenIds(node);
+                pageParam.put("structureIdList", structureIdList);
             }
         }
 
-        if (!ValidationUtil.isEmpty(pageParam.get("order"))) {
-            order = pageParam.get("order").toString();
+        if (!ValidationUtil.isEmpty(pageParam.get("dangerState"))) {
+            List<String> state = Lists.newArrayList(((String) pageParam.get("dangerState")).split(","));
+            pageParam.put("dangerState", state);
         }
 
-        List<String> state = Lists.newArrayList(((String)pageParam.get("dangerState")).split(","));
-
-        LambdaQueryWrapper<LatentDanger> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(LatentDanger::getBizType, bizType)
-                .eq(LatentDanger::getDeleted, false)
-                .like(!ValidationUtil.isEmpty(pageParam.get("name")),
-        LatentDanger::getDangerName, pageParam.get("name"))
-                .eq(!ValidationUtil.isEmpty(pageParam.get("dangerLevel")), LatentDanger::getDangerLevel,
-        pageParam.get("dangerLevel"))
-                .in(!ValidationUtil.isEmpty(pageParam.get("dangerState")), LatentDanger::getDangerState, state)
-                .in(!ValidationUtil.isEmpty(dangerIdList), LatentDanger::getId, dangerIdList)
-                .in(!ValidationUtil.isEmpty(structureIdList), LatentDanger::getStructureId, structureIdList)
-                .orderByDesc(Constants.DESC.equals(order), LatentDanger::getUpdateDate);
-
-        IPage<LatentDanger> iPage = latentDangerMapper.selectPage(page, queryWrapper);
+        if (!ValidationUtil.isEmpty(dangerIdList)) {
+            pageParam.put("dangerIds", dangerIdList);
+        }
 
-        this.baseMapper.selectPageByParam(new Page(Long.parseLong((String) pageParam.get("current")),
-                Long.parseLong((String)pageParam.get("size"))), pageParam);
+        IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(new Page(Long.parseLong((String) pageParam.get("current")),
+                Long.parseLong((String) pageParam.get("size"))), (Map<String, Object>) pageParam);
         Map<Long, String> buildingAbsolutePositionMap = new HashMap<>();
         if (!ValidationUtil.isEmpty(iPage.getRecords())) {
             try {
@@ -1794,8 +1769,19 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             } catch (Exception e) {
             }
             Map<Long, String> finalBuildingAbsolutePositionMap = buildingAbsolutePositionMap;
-            iPage.getRecords().forEach(danger -> danger.setStructureName(finalBuildingAbsolutePositionMap.get(danger.getStructureId())));
+            iPage.getRecords().forEach(danger -> {
+                danger.setStructureName(finalBuildingAbsolutePositionMap.get(danger.getStructureId()));
+                LatentDangerBizTypeEnum bizTypeEnum = LatentDangerBizTypeEnum.getByCode(danger.getBizType());
+                if (bizType.equals(danger.getBizType())) {
+                    LatentDangerState.SupervisionDangerStateEnum dangerStateEnum = LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(danger.getDangerState());
+                    danger.setProcessState(dangerStateEnum.getProcessState());
+                }
+                danger.setBizTypeName(bizTypeEnum.getName());
+                LatentDangerProcessStateEnum processStateEnum = LatentDangerProcessStateEnum.getByCode(danger.getProcessState());
+                danger.setProcessStateName(processStateEnum.getName());
+            });
         }
+
         return iPage;
     }
 
@@ -1976,18 +1962,19 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         String type = pageParam.get("type").toString();
         if ("audit".equals(type)) {
             List<LatentDangerState.SupervisionDangerStateEnum> stateEnums =
-                    LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState("审核中");
+                    LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode());
             List<String> dangerState = stateEnums.stream().map(stateEnum -> stateEnum != null ?
                     stateEnum.getCode() : null).collect(Collectors.toList());
             // 审核状态
             pageParam.put("dangerState", Joiner.on(",").join(dangerState));
         } else if ("review".equals(type)) {
             List<LatentDangerState.SupervisionDangerStateEnum> stateEnums =
-                    LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState("整改中");
+                    LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待复核.getCode());
             List<String> dangerState = stateEnums.stream().map(stateEnum -> stateEnum != null ? stateEnum.getCode() : null).collect(Collectors.toList());
             // 复核状态
             pageParam.put("dangerState", Joiner.on(",").join(dangerState));
         }
+        pageParam.put("bizType", bizType);
         return pageListDanger(pageParam);
     }
 }

amos-boot-system-jcs/src/main/resources/application.properties

-spring.application.name=JCS
+spring.application.name=JCS-tb
 server.servlet.context-path=/jcs
 server.port=11100
 spring.profiles.active=dev
@@ -83,4 +83,6 @@ control.fegin.name=JCS-API-CONTROL
 failure.work.flow.processDefinitionKey=malfunction_repair
 #设置文件上传的大小限制
 spring.servlet.multipart.maxFileSize=3MB
-spring.servlet.multipart.maxRequestSize=3MB
+spring.servlet.multipart.maxRequestSize=3MB
\ No newline at end of file
+
+supervision.feign.name=AMOS-SUPERVISION-API
\ No newline at end of file

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

@@ -946,4 +946,54 @@
         WHERE
         pld.business_key = #{businessKey}
     </select>
+    <select id="selectPageByParam" resultType="com.yeejoin.amos.latentdanger.dao.entity.LatentDanger">
+        select * from cb_latent_danger a
+        <where>
+            deleted = 0
+            <foreach collection="paramMap" index="key" item="value">
+                <if test="key == 'bizType' and value != null and value != ''">
+                    and a.biz_type = #{value}
+                </if>
+                <if test="key == 'dangerIds' and value != null">
+                    and a.id IN
+                    <foreach collection="value" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+                <if test="key == 'dangerState' and value != null">
+                    and a.danger_state IN
+                    <foreach collection="value" item="state" open="(" separator="," close=")">
+                        #{state}
+                    </foreach>
+                </if>
+                <if test="key == 'dangerLevel' and value != null and value != ''">
+                    and a.danger_level = #{value}
+                </if>
+                <if test="key == 'startTime' and value != null and value != ''">
+                    and a.create_date <![CDATA[ >= ]]> #{value}
+                </if>
+                <if test="key == 'endTime' and value != null and value != ''">
+                    and a.create_date <![CDATA[ <= ]]> #{value}
+                </if>
+                <if test="key == 'name' and value != null and value != ''">
+                    and a.danger_name like concat('%', #{value}, '%')
+                </if>
+                <if test="key == 'structureId' and value != null">
+                    and a.structure_id in
+                    <foreach collection="value" item="structureId" open="(" separator="," close=")">
+                        #{structureId}
+                    </foreach>
+                </if>
+                <if test="key == 'planId' and value != null and value != ''">
+                    and a.biz_info->'$.planId' = #{value}
+                </if>
+                <if test="key == 'companyId' and value != null and value != ''">
+                    and a.biz_info->'$.pointId' = #{value}
+                </if>
+            </foreach>
+        </where>
+        <if test="paramMap.order != null and paramMap.order == '1'">
+            order by a.create_date desc
+        </if>
+    </select>
 </mapper>
\ No newline at end of file