修改待办

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

@@ -348,6 +348,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         // 判断当前是否为提交
         List<String> instanceIdList = new ArrayList<>();
+        List<String> taskIds = new ArrayList<>();
         List<WorkflowResultDto> workflowResultDtos = new ArrayList<>();
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             // 发起流程
@@ -366,6 +367,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             List<ProcessTaskDTO> processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
             workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
 
+            for (WorkflowResultDto processTaskDTO : workflowResultDtos) {
+                instanceIdList.add(processTaskDTO.getInstanceId());
+                taskIds.add(processTaskDTO.getNextTaskId());
+            }
 //          if (CollectionUtil.isNotEmpty(processTaskDTOS)){
 //              for (ProcessTaskDTO processTaskDTO : processTaskDTOS) {
 //                  instanceIdList.add(processTaskDTO.getProcessInstance().getId());
@@ -452,6 +457,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 dto.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
             } else {
                 dto.setStatus(WorkFlowStatusEnum.UNITCHANGE_SUBMIT.getPass());
+            } if (!CollectionUtils.isEmpty(taskIds)) {
+                dto.setNextTaskId(taskIds.get(i));
+            } else {
             }
             list.add(dto);
             equipList.add(jgRelationEquip);
@@ -466,13 +474,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             dto.setModel(obj);
             dto.setFlowCreateDate(new Date());
             dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
-            dto.setFlowCode("");
+            dto.setFlowCode(obj.getNextTaskId());
             dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
-            //dto.setTaskDesc();
+            dto.setTaskCode(obj.getApplyNo());
             dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
             dto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
             dto.setRelationId(obj.getInstanceId());
-            dto.setExecuteUserIds(workDto.getNextExecutorUserIds());
+            dto.setExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
             dto.setTaskStatusLabel("未处理");
             dto.setFlowStatus(commonServiceImpl.getDictionaryCodeByName(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass()));
             dto.setFlowStatusLabel(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());