From 98aa93590aa8ec7920554fd9819daed7a93bd109 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 17 Jan 2024 16:43:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2080950=20=E3=80=90=E9=98=BB=E5=A1=9E?= =?UTF-8?q?=E3=80=91=E4=BC=81=E6=A0=87=E7=AB=8B=E9=A1=B9/=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=A1=E5=88=92--=E5=8F=91=E8=B5=B7=E4=BA=BA?= =?UTF-8?q?=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E5=BE=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/EsInitChangeConstant.java | 4 ++-- .../activiti/service/ProcessNodeService.java | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/EsInitChangeConstant.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/EsInitChangeConstant.java index 54f8f634..c917ad7c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/EsInitChangeConstant.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/EsInitChangeConstant.java @@ -9,8 +9,8 @@ public class EsInitChangeConstant { public static final String MAIN_DRAFT_USER_INIT = "主起草人发起"; public static final String CONTACT_USER_CHECK = "部所联络人校对"; public static final String EXPERT_CHECK = "专家审批"; - public static final String MAIN_DRAFT_USER_LEADER = "主起草人主管级领导审批"; - public static final String MAIN_DRAFT_USER_LEADER_LEADER = "主起草人主管级上一级领导审批"; + public static final String MAIN_DRAFT_USER_LEADER = "主管级领导审批"; + public static final String MAIN_DRAFT_USER_LEADER_LEADER = "主管级上一级领导审批"; public static final String STANDARDIZATION_CHECK = "标准化审批"; public static final String NEW_MAIN_DRAFT_LEADER_LEADER = "新起草部门主管级上一级领导下发"; public static final String NEW_MAIN_DRAFT_LEADER = "新起草部门主管级领导确认"; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java index d358a16b..3f2476f2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java @@ -144,14 +144,13 @@ public class ProcessNodeService extends ServiceImpl processNodeList, String processInstanceId) { - // 如果是变更分支 则需要删掉专家审批节点 并将两个节点改名 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId); List processEsInitChanges = esInitChangeService.list(wrapper); if (CollectionUtils.isNotEmpty(processEsInitChanges)) { ProcessEsInitChange processEsInitChange = processEsInitChanges.get(0); - if (Objects.equals(processEsInitChange.getApplicationCategory(), ESPApplicationCategoryEnum.CHANGE.getValue())) { - processNodeList.removeIf(processNode -> Objects.equals(processNode.getNodeName(), EsInitChangeConstant.EXPERT_CHECK)); + if (Objects.equals(processEsInitChange.getApplicationCategory(), ESPApplicationCategoryEnum.INITIATION.getValue())) { + // 将两个节点改名 processNodeList.forEach(processNode -> { if (Objects.equals(processNode.getNodeName(), EsInitChangeConstant.MAIN_DRAFT_USER_LEADER)) { processNode.setNodeName("发起人主管级领导审批"); @@ -161,6 +160,18 @@ public class ProcessNodeService extends ServiceImpl Objects.equals(processNode.getNodeName(), EsInitChangeConstant.EXPERT_CHECK)); + processNodeList.forEach(processNode -> { + if (Objects.equals(processNode.getNodeName(), EsInitChangeConstant.MAIN_DRAFT_USER_LEADER)) { + processNode.setNodeName("主起草人主管级领导审批"); + } + if (Objects.equals(processNode.getNodeName(), EsInitChangeConstant.MAIN_DRAFT_USER_LEADER_LEADER)) { + processNode.setNodeName("主起草人主管级上一级领导审批"); + } + }); + } } }