|
@@ -145,13 +145,9 @@ public class WorkflowTaskBomServiceImpl extends BaseServiceImpl<WorkflowTaskBomM
|
|
&& taskStatus != FlowTaskStatusEnum.CANCEL.getValue()) {
|
|
&& taskStatus != FlowTaskStatusEnum.CANCEL.getValue()) {
|
|
throw new DeniedException("待办事项任务状态有误,请检查");
|
|
throw new DeniedException("待办事项任务状态有误,请检查");
|
|
}
|
|
}
|
|
- // 生成新的taskBom
|
|
|
|
- int currentLevel = task.getNodeSort();
|
|
|
|
- currentLevel++;
|
|
|
|
// 获取flowNode
|
|
// 获取flowNode
|
|
WorkflowNodeDTO node = new WorkflowNodeDTO();
|
|
WorkflowNodeDTO node = new WorkflowNodeDTO();
|
|
node.setFlowId(task.getFlowId());
|
|
node.setFlowId(task.getFlowId());
|
|
- node.setNodeLevel(currentLevel);
|
|
|
|
node.setFrontParentId(task.getFrontId());
|
|
node.setFrontParentId(task.getFrontId());
|
|
List<WorkflowNodeVO> nodeList = workflowNodeMapper.selectNodeList(node);
|
|
List<WorkflowNodeVO> nodeList = workflowNodeMapper.selectNodeList(node);
|
|
if (CollectionUtils.isEmpty(nodeList)) {
|
|
if (CollectionUtils.isEmpty(nodeList)) {
|
|
@@ -210,12 +206,9 @@ public class WorkflowTaskBomServiceImpl extends BaseServiceImpl<WorkflowTaskBomM
|
|
}
|
|
}
|
|
if(continueFlag){
|
|
if(continueFlag){
|
|
// 判断审核的状态,决定处理分支
|
|
// 判断审核的状态,决定处理分支
|
|
- int currentLevel = task.getNodeSort();
|
|
|
|
- currentLevel++;
|
|
|
|
// 获取下一个审批节点,为空,表示流程结束
|
|
// 获取下一个审批节点,为空,表示流程结束
|
|
WorkflowNodeDTO node = new WorkflowNodeDTO();
|
|
WorkflowNodeDTO node = new WorkflowNodeDTO();
|
|
node.setFlowId(task.getFlowId());
|
|
node.setFlowId(task.getFlowId());
|
|
- node.setNodeLevel(currentLevel);
|
|
|
|
node.setFrontParentId(task.getFrontId());
|
|
node.setFrontParentId(task.getFrontId());
|
|
List<WorkflowNodeVO> nodeList = workflowNodeMapper.selectNodeList(node);
|
|
List<WorkflowNodeVO> nodeList = workflowNodeMapper.selectNodeList(node);
|
|
// 封装请求参数
|
|
// 封装请求参数
|