改造变更登记撤回修改

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

@@ -307,6 +307,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
+                taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
                 // 创建新的代办
                 taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
@@ -366,7 +369,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     public void withdraw(String instanceId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectOne(new QueryWrapper<JgChangeRegistrationReform>().eq("instance_id",instanceId));
-        ArrayList<String> roleList = new ArrayList<>();
         ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(instanceId);
         WorkflowResultDto workflowResultDto = conveterProcessTaskDTO2WorkflowResultDto(processTaskDTO);
         String taskCode = Optional.ofNullable(workflowResultDto.getNextTaskCode()).orElse("");
@@ -387,8 +389,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jsonObject.put("nextTaskId", jgChangeRegistrationReform.getNextTaskId());
         jsonObject.put("nextExecuteUser", jgChangeRegistrationReform.getNextExecutorIds());
         jsonObject.put("taskType",BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());
-        jsonObject.put("taskCode",taskCode);
-        jsonObject.put("instanceId",instanceId);
         jsonObject.put("pageType","look");
         //如果创建人等于当前人则打开编辑页面
         if(taskCode.equals(WorkFlowStatusEnum.CHANGE_SUBMIT.getCode())){