From 34d973f9637939fec4eed06eac83db0fc0fc74dc Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 19 Dec 2023 11:43:10 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=BD=92=E6=A1=A3=20=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ProcessProjectAssessService.java | 21 ++++ .../constant/MessageTemplateCodeCommon.java | 1 + .../bpmn/项目合规评估流程 - 副本.bpmn | 4 +- .../main/resources/bpmn/项目合规评估流程.bpmn | 112 +++++++++--------- 4 files changed, 80 insertions(+), 58 deletions(-) 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 6d8223df..cc79bae7 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 @@ -459,11 +459,32 @@ public class ProcessProjectAssessService extends ServiceImpl processInfoVO, ProcessDTO processDTO) { + String businessId = processInfoVO.getBusinessId(); + ProcessProjectAssess projectAssess = this.getById(businessId); + String projectId = projectAssess.getProjectId(); + LawsProjectLibrary lawsProjectLibrary = lawsProjectLibraryService.getById(projectId); + ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + String carbonCopyPersonnels = businessInfoDTO.getCarbonCopyPersonnels(); + + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_ASSESS_COMPLETE); + sendMessageDTO.setToUserId(carbonCopyPersonnels); + Map sendMap = new HashMap<>(); + ProcessAll process = processAllService.getByProcessInstanceId(processDTO.getProcessInstanceId()); + sendMap.put("prcNum", process.getPrcNum()); + sendMap.put("prcName", process.getPrcName()); + sendMap.put("projectName", lawsProjectLibrary.getProjectName()); + sendMessageDTO.setMap(sendMap); + sendMessageAPI.sendMessage(sendMessageDTO); + } + //各部门主管级领导下发 private void gbmzgjldxfSubmit(ProcessInfoVO processInfoVO, ProcessDTO processDTO) { String businessId = processInfoVO.getBusinessId(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java index cf373f88..d6594ec3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java @@ -18,4 +18,5 @@ public class MessageTemplateCodeCommon { public static final String STANDARD_CHANGE_REPLACE = "standard_change_replace"; // 【法规变更】代替/被代替标准变更 public static final String STANDARD_CHANGE_REFERENCE = "standard_change_reference"; // 【法规变更】引用标准变更 public static final String STANDARD_CONSULTATION = "standard_consultation"; // 【征求意见结果提醒】 + public static final String PROJECT_ASSESS_COMPLETE = "项目合规评估完成提醒"; // 【项目合规评估完成提醒】 } diff --git a/laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn b/laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn index fb74ff46..f94569cb 100644 --- a/laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn +++ b/laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn @@ -47,7 +47,7 @@ - ${moduleOwnerListSize > 0} + ${designEngineerListSize > 0} @@ -82,7 +82,7 @@ Flow_1g6f2ww - ${moduleOwnerListSize == 0} + ${designEngineerListSize == 0} diff --git a/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn b/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn index 27e6761b..1c9bfaba 100644 --- a/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn +++ b/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn @@ -47,7 +47,7 @@ - ${moduleOwnerList.size > 0} + ${designEngineerListSize > 0} @@ -82,7 +82,7 @@ Flow_1g6f2ww - ${moduleOwnerList.size == 0} + ${designEngineerListSize == 0} @@ -158,13 +158,6 @@ - - - - - - - @@ -175,25 +168,6 @@ - - - - - - - - - - - - - - - - - - - @@ -201,9 +175,6 @@ - - - @@ -217,11 +188,14 @@ + + + - - + + @@ -270,6 +244,25 @@ + + + + + + + + + + + + + + + + + + + @@ -278,29 +271,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -319,6 +289,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +