移除无用代码

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java

@@ -304,49 +304,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
     }
-//    public String flowExecute(Long id, String instanceId, String operate, String comment, Boolean update) {
-//        String role = "";
-//        String taskName = "流程结束";
-//        ArrayList<String> roleList = new ArrayList<>();
-//        try {
-//            JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
-//            JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
-//            String taskId = taskMessage.getString("id");
-//            //组装信息
-//            TaskResultDTO dto = new TaskResultDTO();
-//            dto.setResultCode("approvalStatus");
-//            dto.setTaskId(taskId);
-//            dto.setComment(comment);
-//            HashMap<String, Object> map = new HashMap<>();
-//            map.put("approvalStatus", operate);
-//            dto.setVariable(map);
-//            //执行流程
-//            Workflow.taskClient.completeByTask(taskId, dto);
-//            // 查询下节点任务
-//            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
-//            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
-//                JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
-//                String nextTaskId = nextTask.getString("id");
-//                taskName = nextTask.getString("name");
-//                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-//                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
-//                for (Object datum : data) {
-//                    if (((Map) datum).containsKey("groupId")) {
-//                        roleList.add(((Map) datum).get("groupId").toString());
-//                    }
-//                }
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        role = String.join(",", roleList);
-//        if (update) {
-//            Boolean rollBack = "1".equals(operate) ? true : false;
-//            updateStatus(id, instanceId, taskName, role, rollBack);
-//        }
-//        return role;
-//    }
-
 
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {
@@ -361,6 +318,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             dto.setComment(comment);
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
+            //2023年12月27日16点33分 流程状态为起草人撤回或者一级审批驳回时需要将提交时的已同意修改为已提交
             if(!ObjectUtils.isEmpty(jgChangeRegistrationReform)&&(jgChangeRegistrationReform.getStatus().equals(WorkFlowStatusEnum.CHANGE_SUBMIT.getRollBack())||jgChangeRegistrationReform.getStatus().equals(WorkFlowStatusEnum.CHANGE_SUBMIT.getReject()))){
                 map.put("approvalStatus", "提交");
             }
@@ -374,36 +332,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         updateExecuteIds(instanceId, id, operate);
 
     }
-//    public void updateStatus(Long id, String instanceId, String taskName, String role, Boolean rollBack) {
-//        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-//        LambdaQueryWrapper<JgChangeRegistrationReform> lambda = new QueryWrapper<JgChangeRegistrationReform>().lambda();
-//        lambda.eq(JgChangeRegistrationReform::getSequenceNbr, id);
-//        JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectOne(lambda);
-//        if ("流程结束".equals(taskName)) {
-//            JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
-//            jgChangeRegistrationReform.setStatus("已完成");
-//            jgChangeRegistrationReform.setAuditStatus(RenovationRegistrationWorkFlowStatusEnum.COMPLETE.getName());
-//
-//            //交换历史数据与新增数据
-//            updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(), jgChangeRegistrationReform.getSupervisoryCode());
-//        } else {
-//            jgChangeRegistrationReform.setNextExecutorIds(role);
-//            jgChangeRegistrationReform.setPromoter(reginParams.getUserModel().getUserId());
-//            if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceStatus())) {
-//                jgChangeRegistrationReform.setInstanceStatus(jgChangeRegistrationReform.getInstanceStatus() + "," + role);
-//            } else {
-//                jgChangeRegistrationReform.setInstanceStatus(role);
-//            }
-//        }
-//        if (rollBack) {
-//            jgChangeRegistrationReform.setAuditStatus(RenovationRegistrationWorkFlowStatusEnum.getMessage(taskName).getReject());
-//            this.getBaseMapper().update(jgChangeRegistrationReform, lambda);
-//            this.getBaseMapper().updatePromoter(jgChangeRegistrationReform.getSequenceNbr());
-//        } else {
-//            jgChangeRegistrationReform.setAuditStatus(RenovationRegistrationWorkFlowStatusEnum.getMessage(taskName).getPass());
-//            this.getBaseMapper().update(jgChangeRegistrationReform, lambda);
-//        }
-//    }
 
     public void withdraw(String instanceId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);