diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ModelerController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ModelerController.java index eeb4aada..03b70a70 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ModelerController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ModelerController.java @@ -435,7 +435,14 @@ public class ModelerController { @PostMapping("/addTask") @ApiOperation("新增节点") public Object addTask(@RequestBody AddTaskVO addTaskVO, HttpServletResponse response) { - return processModelNodeService.addTask(addTaskVO,response); + processModelNodeService.addTask(addTaskVO,response); + return Result.OK(); + } + + @PostMapping("/deleteTask") + @ApiOperation("新增节点") + public Object deleteTask(@RequestBody AddTaskVO addTaskVO, HttpServletResponse response) { + return processModelNodeService.deleteTask(addTaskVO,response); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java index 67e9cadd..8ada4903 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java @@ -54,13 +54,15 @@ public class ProcessModelNodeService extends ServiceImpl flowElements = process.getFlowElements(); List processModelNodeList = new ArrayList<>(); int sort = 1; + //审批节点list List gatewayIdList = new ArrayList<>(); + //处理节点为list processModelNodeList = handlerLawsProcessModelNode(flowElements,sort,gatewayIdList,modelId, null); List approvalNodeIdList = processModelNodeList.stream() .filter(item -> gatewayIdList.contains(item.getXmlTargetRef())) .map(ProcessModelNode::getXmlSourceRef) .collect(Collectors.toList()); - + //判断是否是审批节点 for (ProcessModelNode processModelNode : processModelNodeList) { String xmlNodeId = processModelNode.getXmlNodeId(); if (approvalNodeIdList.contains(xmlNodeId) ){ @@ -150,22 +152,17 @@ public class ProcessModelNodeService extends ServiceImpl flowElements1 = subProcess.getFlowElements(); @@ -313,4 +313,6 @@ public class ProcessModelNodeService extends ServiceImpl