diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java index 67dadfbe..2dc12c3e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java @@ -431,22 +431,22 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask } return result; } - - + + public UserTask getNextTasks(Task task){ - + //获取流程发布Id信息 String definitionId = runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getProcessDefinitionId(); - + //获取bpm对象 BpmnModel bpmnModel = repositoryService.getBpmnModel(definitionId); - + //传节点定义key 获取当前节点 FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(task.getTaskDefinitionKey()); - + //输出连线 List outgoingFlows = flowNode.getOutgoingFlows(); - + //遍历返回下一个节点信息 for (SequenceFlow outgoingFlow : outgoingFlows) { //类型自己判断 @@ -461,7 +461,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask } return null; } - + private void setExclusiveGateway(FlowElement targetFlow) { //排他网关,获取连线信息 List targetFlows = ((ExclusiveGateway) targetFlow).getOutgoingFlows(); @@ -529,7 +529,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask */ private void disposeSucceedTask(Task task, ProcessDefinition processDefinition, Map variables, OcrTaskchildPicture model, String formId, UserToken userToken, FlowApprove approve, String deptid) throws Exception { - + //获取下一个节点 UserTask userTask = this.getNextTasks(task); if(null != userTask){ @@ -1485,7 +1485,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ocrTaskchildPictureApproVo.setProjectName(one.getFromprojectname());//项目名称 ocrTaskchildPictureApproVo.setCustomerLevel(one.getFromCustomerLevel());//客户级别 ocrTaskchildPictureApproVo.setReleaseArea(one.getFromCity());//拜访城市 - ocrTaskchildPictureApproVo.setTaskIndex(one.getTaskNodeIndex() == null ? "1" : one.getTaskNodeIndex()); + ocrTaskchildPictureApproVo.setTaskIndex(one.getTaskNodeIndex() == null ? one.getTasknode() : one.getTaskNodeIndex()); listNew.add(ocrTaskchildPictureApproVo); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java index 2ad729ea..c80e5c71 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java @@ -178,6 +178,9 @@ public class OcrTaskchildPictureAppro implements java.io.Serializable { @ApiModelProperty(value = "历史-节点编号") private String taskno; + @ApiModelProperty(value = "当前所处-节点编号") + private String tasknode; + @ApiModelProperty(value = "项目对象") private Category categoryDto;