From a9a90ab46dc830af8d79783cb70724005a3fa4d1 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Thu, 20 Nov 2025 15:52:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-5865)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3=E5=85=A5?= =?UTF-8?q?=E5=8F=82=EF=BC=8C=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9C=AA=E6=9D=A5=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpmn/process/BpmnProcessInstanceLogQueryDTO.java | 7 +++++++ .../core/service/impl/BpmnProcessInstanceServiceImpl.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceLogQueryDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceLogQueryDTO.java index e0a4841d7..53a1ab6ee 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceLogQueryDTO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceLogQueryDTO.java @@ -47,6 +47,13 @@ public class BpmnProcessInstanceLogQueryDTO { @Builder.Default private Boolean hasButton = false; + /** + * 是否包含未来的节点，默认包含 + */ + @ApiModelProperty(value = "是否包含未来的节点，默认包含") + @Builder.Default + private Boolean includeFutureTasks = true; + /** * 是否需要加密（同一个实例的日志，在不同端[cms/oms]下，审批人的信息需要按一定规则进行隐藏控制） */ diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java index 4b42ba366..351f950ba 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java @@ -1245,7 +1245,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic List forecasting = new ArrayList<>(); // 只有还在运行中的实例才需要推测后续节点 - if (Objects.equals(historicProcessInstance.getBusinessStatus(), PROCESSING.getStatus())) { + if (Objects.equals(historicProcessInstance.getBusinessStatus(), PROCESSING.getStatus()) && Objects.equals(Boolean.TRUE, dto.getIncludeFutureTasks())) { ProcessInstance instance = runtimeService.createProcessInstanceQuery() .processInstanceId(dto.getProcessInstanceId()) .includeProcessVariables()