From 2a1dae80ad17e93f4c78bbad0d4cc66c91e004c4 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 24 Jan 2024 11:11:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2080518=20=E4=BC=81=E6=A0=87=E5=A4=8D?= =?UTF-8?q?=E5=AE=A1=E6=B5=81=E7=A8=8B--=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF--=E4=BB=BB=E5=8A=A1=E8=8A=82=E7=82=B9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=A1=BA=E5=BA=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/listener/MyGlobalEventListener.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 f621a1a4..b52985bb 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 @@ -28,6 +28,7 @@ import org.activiti.engine.impl.persistence.entity.TaskEntity; import org.springframework.stereotype.Component; import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -247,6 +248,17 @@ public class MyGlobalEventListener implements ActivitiEventListener { ProcessAll process = processAllService.getOne(new LambdaQueryWrapper() .eq(ProcessAll::getProcessInstanceId, processInstanceId)); ProcessNodeService processNodeService = SpringContextUtil.getBean(ProcessNodeService.class); + // 企标复审流程前两个节点都要视为第一个节点 + if (process.getPrcType().equals(ProcessTypeEnum.ES_RECHECK.getValue())) { + List nodeList = processNodeService.list(new LambdaQueryWrapper() + .eq(ProcessNode::getProcessDefinitionId, process.getProcessDefinitionId()) + .eq(ProcessNode::getSort, 2)); + for (ProcessNode node : nodeList) { + if (record.getNodeId().equals(node.getXmlNodeId()) && record.getTaskName().equals(node.getNodeName())) { + return true; + } + } + } ProcessNode node = processNodeService.getOne(new LambdaQueryWrapper() .eq(ProcessNode::getProcessDefinitionId, process.getProcessDefinitionId()) .eq(ProcessNode::getSort, 1));