启用停用待办修改

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/JgEnableDisableServiceImpl.java

@@ -319,13 +319,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         TaskV2Model taskV2Model = new TaskV2Model();
         if ("0".equals(operate)) {
             if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
-                LambdaQueryWrapper<JgEnableDisableEq> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(JgEnableDisableEq::getEnableDisableApplyId, id);
-                JgEnableDisableEq jgEnableDisableEq = jgEnableDisableEqMapper.selectOne(queryWrapper);
-
-                LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
-                queryWrapper2.eq(RegistrationInfo::getRecord, jgEnableDisableEq.getEquId());
-                RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
                 jgEnableDisable.setPromoter("");
                 jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getName()));
                 // 上个代办改为已办
@@ -336,7 +329,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
                 taskMap.put("model", jgEnableDisable);
-                taskV2Model = commonService.updateTaskModel(taskMap);
+                commonService.updateTaskModel(taskMap);
             } else {
                 jgEnableDisable.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());
                 if (!ObjectUtils.isEmpty(jgEnableDisable.getExecuteSequence())) {
@@ -414,11 +407,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         workDto.setResultCode("approvalStatus");
         workDto.setTaskId(jgEnableDisable.getNextTaskId());
         HashMap<String, Object> commMap = new HashMap<>();
-        if (jgEnableDisable.getAuditStatus().equals("已驳回") || jgEnableDisable.getAuditStatus().equals("已撤回")) {
-            commMap.put("approvalStatus", "提交");
-        } else {
         commMap.put("approvalStatus", op);
-        }
         workDto.setVariable(commMap);
         workDto.setComment(opinion);
         processTaskDTO = iCmWorkflowService.complete(jgEnableDisable.getNextTaskId(), workDto);