From e9d70ca1711a92a4c8d8ef9a04952890926cd7b0 Mon Sep 17 00:00:00 2001 From: liao Date: Mon, 27 Nov 2023 09:19:28 +0800 Subject: [PATCH] =?UTF-8?q?fix=2078554=20=E3=80=90=E5=9E=82=E7=9B=B4?= =?UTF-8?q?=E8=B6=8A=E6=9D=83=E3=80=91=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86?= =?UTF-8?q?-=E5=9E=82=E7=9B=B4=E8=B6=8A=E6=9D=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fb/common/ConsultationTaskKey.java | 2 +- ...cessFbStandardConsultationServiceImpl.java | 11 +- .../LawsProblemLibraryController.java | 3 + .../LawsStandardSharingController.java | 3 + .../main/resources/bpmn/标准征求意见流程.bpmn | 243 +++++++++--------- 5 files changed, 136 insertions(+), 126 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java index 9f2cecd1..fe402489 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java @@ -13,7 +13,7 @@ public class ConsultationTaskKey { public static final String ENGINEER_START_END = "engineer_start_end"; // 法规工程师审批 - public static final String REJECT = "reject"; // 法规工程师驳回 + public static final String REJECT = "reject"; // 驳回 public static final String DEPART_LEADER_START_1 = "depart_leader_start_1"; // 各部所主管级领导分发 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index 3aa37e5c..6548b95c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -356,12 +356,21 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).list(); List executionList = runtimeService.createExecutionQuery().processInstanceId(processInstanceId).list(); log.info("还剩 {} 个任务待完成", taskList.size()); + taskList.forEach(lastTask -> { + log.info("======================================================================="); + log.info("任务id: {}", lastTask.getId()); + log.info("任务name: {}", lastTask.getName()); + log.info("任务executionId: {}", lastTask.getExecutionId()); + log.info("======================================================================="); + }); log.info("还剩 {} 个执行实例待完成", executionList.size()); - taskList.forEach(lastTask -> log.info("任务id: {}", lastTask.getId())); executionList.forEach(lastExecution -> { + log.info("======================================================================="); log.info("执行实例id: {}", lastExecution.getId()); + log.info("执行实例parentId: {}", lastExecution.getParentId()); log.info("执行实例name: {}", lastExecution.getName()); log.info("执行实例activityId: {}", lastExecution.getActivityId()); + log.info("======================================================================="); }); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java b/laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java index e11435fb..38015fe2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java @@ -62,6 +62,7 @@ public class LawsProblemLibraryController extends JeroController addProblemGB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { lawsProblemLibrary.setType("1"); lawsProblemLibraryService.addProblem(lawsProblemLibrary); @@ -71,6 +72,7 @@ public class LawsProblemLibraryController extends JeroController addProblemFB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { lawsProblemLibrary.setType("2"); lawsProblemLibraryService.addProblem(lawsProblemLibrary); @@ -80,6 +82,7 @@ public class LawsProblemLibraryController extends JeroController addProblemQB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { lawsProblemLibrary.setType("3"); lawsProblemLibraryService.addProblem(lawsProblemLibrary); diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java index d6a3db9b..a2b32944 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java @@ -119,6 +119,7 @@ public class LawsStandardSharingController extends JeroController domesticAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); SysUser user = sysUserService.getById(sysUser.getId()); @@ -174,6 +175,7 @@ public class LawsStandardSharingController extends JeroController overseasAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { // 发送消息 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -213,6 +215,7 @@ public class LawsStandardSharingController extends JeroController enterpriseAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); SysUser user = sysUserService.getById(sysUser.getId()); diff --git a/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn b/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn index ad0512b6..22b402bc 100644 --- a/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn +++ b/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn @@ -116,7 +116,7 @@ Flow_09jjte7 - Flow_0zrmtql + Flow_17fjaez @@ -131,14 +131,12 @@ Flow_0dy528b + Flow_17fjaez ${passSecond} - - Flow_0zrmtql - - + @@ -206,7 +204,7 @@ ${!passSecond} - + @@ -249,8 +247,18 @@ + + + + + + + + + + - + @@ -276,46 +284,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -327,6 +295,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -348,14 +353,13 @@ - - + - + - + @@ -381,102 +385,93 @@ - + - + + - - - - - - - - - - - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - + + + - - - - + + + + - + - - - - - - - - - - + + - + - - - - - - - + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + @@ -487,30 +482,30 @@ - - + + - - + + - - + + - + - - + + - + - - + +