隐患审核修改

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

@@ -28,7 +28,6 @@ import com.yeejoin.amos.latentdanger.business.dao.mapper.LatentDangerFlowRecordM
 import com.yeejoin.amos.latentdanger.business.dao.mapper.LatentDangerMapper;
 import com.yeejoin.amos.latentdanger.business.dao.mapper.LatentDangerPatrolMapper;
 import com.yeejoin.amos.latentdanger.business.dto.DangerExecuteSubmitDto;
-import com.yeejoin.amos.latentdanger.business.dto.ExecuteSubmitDto;
 import com.yeejoin.amos.latentdanger.business.entity.mybatis.DangerResultBo;
 import com.yeejoin.amos.latentdanger.business.entity.mybatis.DictBo;
 import com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo;
@@ -173,6 +172,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
     @Autowired
     private WorkflowFeignService workflowFeignService;
 
+    // 降序排列
+    private static String DESC = "desc";
+
+    // 升序排列
+    private static String ASC = "desc";
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public CommonResponse saveNormal(LatentDangerDto latentDangerDto, String userId, String userRealName,
@@ -187,7 +192,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 
         LatentDangerDto latentDto = new LatentDangerDto();
         Bean.copyExistPropertis(latentDangerDto, latentDto);
-        LatentDanger latentDanger = saveLatentDanger2(latentDto, userId, departmentId, businessKey, orgCode, LatentDangerTypeEnum.随手拍);
+        LatentDanger latentDanger = saveLatentDanger(latentDto, userId, departmentId, businessKey, orgCode, LatentDangerTypeEnum.随手拍);
 
         // 更新p_check_input表state字段
 //        updateCheckInputDangerState(latentDanger.getBizId(), DangerHandleStateEnum.HANDLE.getCode());
@@ -254,7 +259,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             }
 
             // 保存隐患
-            LatentDanger latentDanger = saveLatentDanger2(param, userId, departmentId, businessKey, orgCode,
+            LatentDanger latentDanger = saveLatentDanger(param, userId, departmentId, businessKey, orgCode,
                     dangerTypeEnum);
 
             JSONObject instance = new JSONObject();
@@ -331,40 +336,41 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         latentDangerMapper.updateCheckInputDangerState(id, code);
     }
 
-    public LatentDanger saveLatentDanger(String bizType, String instanceId, String problemDescription, String remark,
-                                           String userId, String departmentId, String businessKey, String orgCode,
-                                           String dangerName, String level, String position,
-                                           LatentDangerTypeEnum dangerTypeEnum, List<String> photoUrls,
-                                           Long checkInputId, Long structureId, String structureName,
-                                           String instanceKey, String longitude, String latitude) {
-        LatentDanger latentDanger = new LatentDanger();
-        latentDanger.setBizType(bizType);
-        latentDanger.setInstanceId(instanceId);
-        latentDanger.setProblemDescription(problemDescription);
-        latentDanger.setRemark(remark);
-        latentDanger.setDangerState(LatentDangerStateEnum.待评审.getCode().toString());
-        latentDanger.setDiscovererUserId(userId);
-        latentDanger.setDiscovererDepartmentId(departmentId);
-        latentDanger.setBusinessKey(businessKey);
-        latentDanger.setOrgCode(orgCode);
-        latentDanger.setDangerName(dangerName);
-        latentDanger.setDangerLevel(level);
-        latentDanger.setDangerPosition(position);
-        latentDanger.setDangerType(dangerTypeEnum.getCode().toString());
-        latentDanger.setLongitude(longitude);
-        latentDanger.setLatitude(latitude);
-        latentDanger.setPhotoUrls(Joiner.on(",").join(photoUrls));
-        latentDanger.setBizId(checkInputId);
-        latentDanger.setStructureId(structureId);
-        latentDanger.setStructureName(structureName);
-        latentDanger.setInstanceKey(instanceKey);
-        this.saveOrUpdate(latentDanger);
-        return latentDanger;
-    }
+//    public LatentDanger saveLatentDanger(String bizType, String instanceId, String problemDescription, String remark,
+//                                           String userId, String departmentId, String businessKey, String orgCode,
+//                                           String dangerName, String level, String position,
+//                                           LatentDangerTypeEnum dangerTypeEnum, List<String> photoUrls,
+//                                           Long checkInputId, Long structureId, String structureName,
+//                                           String instanceKey, String longitude, String latitude) {
+//        LatentDanger latentDanger = new LatentDanger();
+//        latentDanger.setBizType(bizType);
+//        latentDanger.setInstanceId(instanceId);
+//        latentDanger.setProblemDescription(problemDescription);
+//        latentDanger.setRemark(remark);
+//        latentDanger.setDangerState(LatentDangerStateEnum.待评审.getCode().toString());
+//        latentDanger.setDiscovererUserId(userId);
+//        latentDanger.setDiscovererDepartmentId(departmentId);
+//        latentDanger.setBusinessKey(businessKey);
+//        latentDanger.setOrgCode(orgCode);
+//        latentDanger.setDangerName(dangerName);
+//        latentDanger.setDangerLevel(level);
+//        latentDanger.setDangerPosition(position);
+//        latentDanger.setDangerType(dangerTypeEnum.getCode().toString());
+//        latentDanger.setLongitude(longitude);
+//        latentDanger.setLatitude(latitude);
+//        latentDanger.setPhotoUrls(Joiner.on(",").join(photoUrls));
+//        latentDanger.setBizId(checkInputId);
+//        latentDanger.setStructureId(structureId);
+//        latentDanger.setStructureName(structureName);
+//        latentDanger.setInstanceKey(instanceKey);
+//        this.saveOrUpdate(latentDanger);
+//        return latentDanger;
+//    }
 
-    public LatentDanger saveLatentDanger2(LatentDangerDto dangerDto, String userId,
-                                          String departmentId, String businessKey, String orgCode,
-                                          LatentDangerTypeEnum dangerTypeEnum) {
+    public LatentDanger saveLatentDanger(LatentDangerDto dangerDto, String userId,
+                                         String departmentId, String businessKey, String orgCode,
+                                         LatentDangerTypeEnum dangerTypeEnum) {
+        String bizType = redisUtils.get(Constants.DANGER_BIZ_TYPE_KEY).toString();
         LatentDanger latentDanger = new LatentDanger();
         Bean.copyExistPropertis(dangerDto, latentDanger);
         if (ValidationUtil.isEmpty(dangerDto.getId())) {
@@ -374,6 +380,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             latentDanger.setDiscovererUserId(userId);
             latentDanger.setOrgCode(orgCode);
             latentDanger.setDangerType(dangerTypeEnum.getCode());
+            if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
+                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());
+            }
             if (ValidationUtil.isEmpty(dangerDto.getDangerName())) {
                 latentDanger.setDangerName(dangerDto.getInputItemName());
             }
@@ -1640,9 +1653,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 
     @Override
     public IPage<LatentDanger> listDanger(PageParam pageParam) throws Exception {
+        String bizType = redisUtils.get(Constants.DANGER_BIZ_TYPE_KEY).toString();
+        LatentDangerBizTypeEnum bizTypeEnum = LatentDangerBizTypeEnum.getByCode(bizType);
         IPage<LatentDanger> page = new Page<>(Integer.parseInt((String) pageParam.get("current")),
                 Integer.parseInt((String) pageParam.get("size")));
-        List allTaskList = Lists.newArrayList();
+        List allTaskList;
+        String order = ASC;
         String idsStr = (String) pageParam.get("dangerIds");
         List<String> dangerIdList = Lists.newArrayList();
         if (StringUtil.isNotEmpty(idsStr)) {
@@ -1652,8 +1668,14 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             // 不指定隐患id-我的任务
             JSONObject allTaskResult = workflowFeignService.getCurrentUserAllTaskList(workflowProcessDefinitionKey);
             allTaskList = (List) allTaskResult.get("data");
-            if (ValidationUtil.isEmpty(allTaskList)) {
-                return page;
+
+            // 没设置隐患状态，说明查询 我的任务 或 所有是 提交隐患 状态的任务
+            if (ValidationUtil.isEmpty(pageParam.get("dangerState"))) {
+                if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
+                    pageParam.put("dangerState", LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
+                } else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
+                    pageParam.put("dangerState", LatentDangerState.PatrolDangerLevelEnum.待评审.getCode());
+                }
             }
         }
         // 获取隐患地点的子节点
@@ -1668,6 +1690,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             }
         }
 
+        if (ValidationUtil.isEmpty(pageParam.get(DESC))) {
+            order = DESC;
+        }
+
         LambdaQueryWrapper<LatentDanger> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.like(!ValidationUtil.isEmpty(pageParam.get("name")),
                 LatentDanger::getDangerName, pageParam.get("name"))
@@ -1677,7 +1703,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                         pageParam.get("dangerState"))
                 .eq(LatentDanger::getDeleted, false)
                 .in(!ValidationUtil.isEmpty(pageParam.get("dangerIds")), LatentDanger::getId, dangerIdList)
-                .in(!ValidationUtil.isEmpty(structureIdList), LatentDanger::getStructureId, structureIdList);
+                .in(!ValidationUtil.isEmpty(structureIdList), LatentDanger::getStructureId, structureIdList)
+                .orderByDesc(DESC == order, LatentDanger::getUpdateDate);
         return latentDangerMapper.selectPage(page, queryWrapper);
 
 //        List<DangerListResponse> dangerListResponseList = latentDangerMapper.dangerListByMap(pageParam);