From 2de49238848dccc54ce9255affe388317d9e9f0c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jan 2024 18:28:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=2081558=20=E6=B3=95=E8=A7=84=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E9=83=A8?= =?UTF-8?q?=E6=89=80=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=AE=A1?= =?UTF-8?q?=E6=89=B9-=E9=A9=B3=E5=9B=9E=EF=BC=8C=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=A2=E4=BA=86=2081381=20=E6=B3=95=E8=A7=84=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E4=B8=8D=E6=B6=89=E5=8F=8A=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=EF=BC=8C=E9=A9=B3=E5=9B=9E=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E9=94=99=E8=AF=AF=20update=20=E6=B3=95=E8=A7=84=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B.bpmn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActivitiController.java | 11 +- .../listener/MyGlobalEventListener.java | 2 +- .../common/ProcessProjectAssessCommon.java | 1 + .../service/ProcessProjectAssessService.java | 10 + .../ProcessProjectStandardService.java | 6 + .../main/resources/bpmn/法规合规评估流程.bpmn | 1481 ++++++++++------- .../bpmn/法规合规评估流程camund.bpmn | 1481 ++++++++++------- 7 files changed, 1708 insertions(+), 1284 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java index f1545789..ee1d2c88 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java @@ -59,6 +59,8 @@ public class ActivitiController { @Resource private HistoryService historyService; @Resource + private RuntimeService runtimeService; + @Resource private TaskService taskService; @Resource private ProcessNodeService processNodeService; @@ -105,7 +107,7 @@ public class ActivitiController { map1.put("流程实例id：", processInstanceId); map1.put("当前活动Id：", processInstance.getActivityId()); - String mainDrafter = map.get("mainDrafter").toString(); + //String mainDrafter = map.get("mainDrafter").toString(); return Result.OK(map1); } @@ -173,6 +175,13 @@ public class ActivitiController { return Result.OK(); } + @GetMapping("/deleteProcessInstance") + @ApiOperation(value = "删除流程实例", notes = "删除流程实例") + public Result deleteProcessInstance(@RequestParam(value = "id", required = false) String id) { + runtimeService.deleteProcessInstance(id,"删除"); + return Result.OK(); + } + @GetMapping("/deleteDeployment") @ApiOperation(value = "删除已部署的流程定义", notes = "删除已部署的流程定义") public Result deleteDeployment(@RequestParam(value = "id", required = false) String id) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index d95be9e4..07172746 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java @@ -128,7 +128,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { wrapper.eq(ProcessNode::getNodeName,name); wrapper.eq(ProcessNode::getIsView, YesOrNoEnum.YES.getValue()); int count = processNodeService.count(wrapper); - if (count == 0){ + if (count == 0 || "123".equals(assignee)){ return; } //新增待审批记录 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java index dcc1cd09..886d9428 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java @@ -12,6 +12,7 @@ public class ProcessProjectAssessCommon { public static final String DESIGN_ENGINEER_LIST = "designEngineerList"; public static final String DESIGN_ENGINEER_LIST_SIZE = "designEngineerListSize"; public static final String PASS = "pass"; + public static final String SKIP = "skip"; public static final String EXECUTION_ID = "executionId"; //法规工程师发起 public static final String FGGCSFQ = "fggcsfq"; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index fd60ab4a..4f9b6abf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -911,5 +911,15 @@ public class ProcessProjectAssessService extends ServiceImpl variables = new HashMap<>(); + variables.put(ProcessProjectAssessCommon.SKIP, true); + taskService.complete(delegateTask.getId(), variables); + } + }else { + runtimeService.setVariable(delegateTask.getExecutionId(),ProcessProjectAssessCommon.SKIP,false); + } } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index 92e1c3cd..a1596149 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -522,6 +522,12 @@ public class ProcessProjectStandardService extends ServiceImpl ${moduleOwnerListSize > 0} - - Flow_04bioxt - Flow_0q2chl1 - Flow_1rrn9dm - - - ${notInvolvedModuleOwnerListSize > 0} - - - ${moduleOwnerListSize > 0} - + + ${pass} @@ -129,11 +120,6 @@ ${!pass} - - Flow_11i64js - Flow_1jjyqj0 - Flow_1wdzyax - Flow_1wdzyax Flow_0q2chl1 @@ -148,7 +134,7 @@ Flow_0n3x332 - Flow_1mwm3jy + Flow_1f6uwa2 Flow_1mwm3jy @@ -185,7 +171,10 @@ Flow_1u1h3jz - + + + ${!skip} + ${designEngineerListSize == 0} @@ -195,11 +184,23 @@ ${!pass} - ${pass} + + Flow_1f6uwa2 + Flow_1wjpfr4 + Flow_1mwm3jy + + + + Flow_1wjpfr4 + + + ${skip} + + Flow_1jjyqj0 @@ -208,15 +209,14 @@ ${nrOfInstances == nrOfCompletedInstances} - Flow_18i416j + Flow_0z02blx - Flow_1al6zeq - Flow_1m13a5m + Flow_0qoyqbk Flow_11c0pso ${nrOfInstances == nrOfCompletedInstances} @@ -250,10 +250,25 @@ - Flow_18i416j - Flow_1m13a5m + Flow_0z02blx + Flow_1i2eq8b - + + + Flow_1i2eq8b + Flow_18wkchm + Flow_0qoyqbk + + + + Flow_18wkchm + + + ${skip} + + + ${!skip} + Flow_132fp4x @@ -268,6 +283,16 @@ Flow_0obo4r2 Flow_10o9sl2 + + Flow_11i64js + Flow_1wdzyax + Flow_1jjyqj0 + + + Flow_0q2chl1 + Flow_04bioxt + Flow_1rrn9dm + @@ -335,7 +360,7 @@ Flow_0j9t3br - Flow_1y4773i + Flow_14vzop0 Flow_1wjzl0u ${nrOfInstances == nrOfCompletedInstances} @@ -356,9 +381,23 @@ Flow_1lw0nd8 - Flow_1y4773i + Flow_0xcpnrt - + + Flow_0xcpnrt + Flow_0zm7wyc + Flow_14vzop0 + + + + Flow_0zm7wyc + + + ${skip} + + + ${!skip} + @@ -383,13 +422,13 @@ Flow_0sdhvpq - Flow_09obdrn + Flow_06tovlr Flow_0uq7eff - Flow_09obdrn + Flow_0veoc18 Flow_0uq7eff Flow_0stb0ce @@ -420,7 +459,6 @@ Flow_1sx8sgp - ${designEngineerListSize == 0} @@ -435,6 +473,21 @@ ${pass} + + Flow_06tovlr + Flow_0veoc18 + Flow_1o6vmld + + + + ${!skip} + + + Flow_1o6vmld + + + ${skip} + Flow_0rkq2tw @@ -546,7 +599,7 @@ Flow_0pc4bzx - Flow_11r05ia + Flow_1xw5o1x Flow_1im30fq ${nrOfInstances == nrOfCompletedInstances} @@ -558,7 +611,7 @@ Flow_0nzw80j - Flow_11r05ia + Flow_1k84u1n @@ -569,7 +622,21 @@ ${pass} - + + Flow_1k84u1n + Flow_1yxa2g2 + Flow_1xw5o1x + + + + Flow_1yxa2g2 + + + ${skip} + + + ${!skip} + Flow_0gtzh06 @@ -585,13 +652,13 @@ Flow_02naor5 - Flow_16y47ea + Flow_0zu6owj Flow_1gwfkl5 - Flow_16y47ea + Flow_1kr2i1f Flow_1gwfkl5 Flow_0jmj18j @@ -622,7 +689,6 @@ Flow_1tge35x - ${designEngineerListSize == 0} @@ -637,6 +703,21 @@ ${pass} + + Flow_0zu6owj + Flow_1kr2i1f + Flow_102whmg + + + + ${!skip} + + + Flow_102whmg + + + ${skip} + @@ -750,933 +831,1051 @@ - + - - - - - - - - - - - - - - - - - - - - + - + - + - + - - + + - - - - - - - - - - - - - - - - - - + + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - + + + + + + + + + + - - + + + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + - + - + - + - + - + - + - - - - + + + + + + - - - - + + + + - + - - - - - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - + + - - + + - + + + + + + + + - - - + + - - - + + - - - - - + + + + + - - - - - - + + + - - - + + + - + - - + + - + - - + + - + + + + + + + + - - + + - - + + + + + + + + + + + - - + + + - + - - - - - - - - - - + - + - + - + - + - + - + - + + + + + + + - - + + - - + + - - - - + + + + - + - - + + - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - + - + - + - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - - - + + + + - + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - + + - + - - + + - + - - - + + + - + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + - - + + - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + + + + + + + - - + + - - + + - - - - + + + + - + - - + + - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - + - + - + - + - + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - - - + + + + - + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + - - + + - + - - + + - + - - + + - + - - - + + + - + - - - + + - - - + + - - - - - - + + + - - - + + + - - - - - - - - - - - + + + - + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - - - - - - - + - - - - + + + + - - - - + + + + + + - + - + - - - + + + + + + + + + + + diff --git a/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn b/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn index 56c72915..c833cc25 100644 --- a/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn +++ b/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn @@ -107,21 +107,12 @@ ${moduleOwnerListSize > 0} - - Flow_04bioxt - Flow_0q2chl1 - Flow_1rrn9dm - - - ${notInvolvedModuleOwnerListSize > 0} - - - ${moduleOwnerListSize > 0} - + + ${pass} @@ -129,11 +120,6 @@ ${!pass} - - Flow_11i64js - Flow_1jjyqj0 - Flow_1wdzyax - Flow_1wdzyax Flow_0q2chl1 @@ -148,7 +134,7 @@ Flow_0n3x332 - Flow_1mwm3jy + Flow_1f6uwa2 Flow_1mwm3jy @@ -185,7 +171,10 @@ Flow_1u1h3jz - + + + ${!skip} + ${designEngineerListSize == 0} @@ -195,11 +184,23 @@ ${!pass} - ${pass} + + Flow_1f6uwa2 + Flow_1wjpfr4 + Flow_1mwm3jy + + + + Flow_1wjpfr4 + + + ${skip} + + Flow_1jjyqj0 @@ -208,15 +209,14 @@ ${nrOfInstances == nrOfCompletedInstances} - Flow_18i416j + Flow_0z02blx - Flow_1al6zeq - Flow_1m13a5m + Flow_0qoyqbk Flow_11c0pso ${nrOfInstances == nrOfCompletedInstances} @@ -250,10 +250,25 @@ - Flow_18i416j - Flow_1m13a5m + Flow_0z02blx + Flow_1i2eq8b - + + + Flow_1i2eq8b + Flow_18wkchm + Flow_0qoyqbk + + + + Flow_18wkchm + + + ${skip} + + + ${!skip} + Flow_132fp4x @@ -268,6 +283,16 @@ Flow_0obo4r2 Flow_10o9sl2 + + Flow_11i64js + Flow_1wdzyax + Flow_1jjyqj0 + + + Flow_0q2chl1 + Flow_04bioxt + Flow_1rrn9dm + @@ -335,7 +360,7 @@ Flow_0j9t3br - Flow_1y4773i + Flow_14vzop0 Flow_1wjzl0u ${nrOfInstances == nrOfCompletedInstances} @@ -356,9 +381,23 @@ Flow_1lw0nd8 - Flow_1y4773i + Flow_0xcpnrt - + + Flow_0xcpnrt + Flow_0zm7wyc + Flow_14vzop0 + + + + Flow_0zm7wyc + + + ${skip} + + + ${!skip} + @@ -383,13 +422,13 @@ Flow_0sdhvpq - Flow_09obdrn + Flow_06tovlr Flow_0uq7eff - Flow_09obdrn + Flow_0veoc18 Flow_0uq7eff Flow_0stb0ce @@ -420,7 +459,6 @@ Flow_1sx8sgp - ${designEngineerListSize == 0} @@ -435,6 +473,21 @@ ${pass} + + Flow_06tovlr + Flow_0veoc18 + Flow_1o6vmld + + + + ${!skip} + + + Flow_1o6vmld + + + ${skip} + Flow_0rkq2tw @@ -546,7 +599,7 @@ Flow_0pc4bzx - Flow_11r05ia + Flow_1xw5o1x Flow_1im30fq ${nrOfInstances == nrOfCompletedInstances} @@ -558,7 +611,7 @@ Flow_0nzw80j - Flow_11r05ia + Flow_1k84u1n @@ -569,7 +622,21 @@ ${pass} - + + Flow_1k84u1n + Flow_1yxa2g2 + Flow_1xw5o1x + + + + Flow_1yxa2g2 + + + ${skip} + + + ${!skip} + Flow_0gtzh06 @@ -585,13 +652,13 @@ Flow_02naor5 - Flow_16y47ea + Flow_0zu6owj Flow_1gwfkl5 - Flow_16y47ea + Flow_1kr2i1f Flow_1gwfkl5 Flow_0jmj18j @@ -622,7 +689,6 @@ Flow_1tge35x - ${designEngineerListSize == 0} @@ -637,6 +703,21 @@ ${pass} + + Flow_0zu6owj + Flow_1kr2i1f + Flow_102whmg + + + + ${!skip} + + + Flow_102whmg + + + ${skip} + @@ -750,933 +831,1051 @@ - + - - - - - - - - - - - - - - - - - - - - + - + - + - + - - + + - - - - - - - - - - - - - - - - - - + + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - + + + + + + + + + + - - + + + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + - + - + - + - + - + - + - - - - + + + + + + - - - - + + + + - + - - - - - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - + + - - + + - + + + + + + + + - - - + + - - - + + - - - - - + + + + + - - - - - - + + + - - - + + + - + - - + + - + - - + + - + + + + + + + + - - + + - - + + + + + + + + + + + - - + + + - + - - - - - - - - - - + - + - + - + - + - + - + - + + + + + + + - - + + - - + + - - - - + + + + - + - - + + - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - + - + - + - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - - - + + + + - + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - + + - + - - + + - + - - - + + + - + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + - - + + - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + + + + + + + - - + + - - + + - - - - + + + + - + - - + + - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - + - + - + - + - + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + - + - - - - + + + + - + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + - - + + - + - - + + - + - - + + - + - - - + + + - + - - - + + - - - + + - - - - - - + + + - - - + + + - - - - - - - - - - - + + + - + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - - - - - - - + - - - - + + + + - - - - + + + + + + - + - + - - - + + + + + + + + + + +