转办修改返回值

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

@@ -14,5 +14,5 @@ public interface ICmWorkflowService {
 
     ProcessTaskDTO rollBack(String processInstanceId);
 
-    String assign(FlowTaskVo taskVo);
+    ProcessTaskDTO assign(FlowTaskVo taskVo);
 }

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

@@ -93,11 +93,11 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
 
 
     @Override
-    public String assign(FlowTaskVo taskVo) {
-        String result;
+    public ProcessTaskDTO assign(FlowTaskVo taskVo) {
+        ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
         try {
             log.info("开始请求工作流转办任务接口:/assign/{taskVo},请求参数：{},{}", taskVo);
-             result = Workflow.taskV2Client.assign(taskVo).getResult();
+            processTaskDTO = Workflow.taskV2Client.assign(taskVo).getResult();
         } catch (InnerInvokException e) {
             //拦截无审核人异常信息
             String devMessage = e.getDevMessage();
@@ -108,6 +108,6 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
             log.error("调用工作流转办任务接口失败", e);
             throw new RuntimeException("调用工作流转办任务接口失败");
         }
-        return result;
+        return processTaskDTO;
     }
 }

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

@@ -654,7 +654,7 @@ public class CommonServiceImpl implements ICommonService {
         FlowTaskVo flowTaskVo = new FlowTaskVo();
         flowTaskVo.setTaskId(taskId);
         flowTaskVo.setAssignee(assignee);
-        cmWorkflowService.assign(flowTaskVo);
+        ProcessTaskDTO processTaskDTO = cmWorkflowService.assign(flowTaskVo);
         //修改待办
         List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(instanceId).getResult();
         List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
@@ -672,7 +672,11 @@ public class CommonServiceImpl implements ICommonService {
         Systemctl.taskV2Client.update(taskV2Model, taskV2Model.getSequenceNbr());
         //创建新待办
         taskV2Model.setExecuteUserIds(assignee);
+        String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
+        taskV2Model.setFlowCode(nextTaskId);
+        String routhPath1 = routhPath.replace("nextTaskId", "nextTask") + "&nextTaskId=" + nextTaskId;
         taskV2Model.setCreateDate(new Date());
+        taskV2Model.setRoutePath(routhPath1);
         taskV2Model.setTaskStatus(0);
         taskV2Model.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
         taskV2Model.setEndUserId(null);
@@ -683,7 +687,7 @@ public class CommonServiceImpl implements ICommonService {
         String id = commonMapper.selectBusinessData(tableName, instanceId);
         id = ObjectUtils.isEmpty(id) ? assignee : id + "," + assignee;
         //修改业务数据
-        commonMapper.updateBusinessData(tableName, assignee, id, instanceId);
+        commonMapper.updateBusinessData(tableName, assignee, id, instanceId,nextTaskId);
         return Boolean.TRUE;
     }