feat(REQ-5865) - 调整审批日志接口入参,控制是否增加查询未来节点
This commit is contained in:
parent
8259f31173
commit
a9a90ab46d
@ -47,6 +47,13 @@ public class BpmnProcessInstanceLogQueryDTO {
|
|||||||
@Builder.Default
|
@Builder.Default
|
||||||
private Boolean hasButton = false;
|
private Boolean hasButton = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否包含未来的节点,默认包含
|
||||||
|
*/
|
||||||
|
@ApiModelProperty(value = "是否包含未来的节点,默认包含")
|
||||||
|
@Builder.Default
|
||||||
|
private Boolean includeFutureTasks = true;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 是否需要加密(同一个实例的日志,在不同端[cms/oms]下,审批人的信息需要按一定规则进行隐藏控制)
|
* 是否需要加密(同一个实例的日志,在不同端[cms/oms]下,审批人的信息需要按一定规则进行隐藏控制)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1245,7 +1245,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
|
|||||||
|
|
||||||
List<ProcessNodeDetailVO> forecasting = new ArrayList<>();
|
List<ProcessNodeDetailVO> 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()
|
ProcessInstance instance = runtimeService.createProcessInstanceQuery()
|
||||||
.processInstanceId(dto.getProcessInstanceId())
|
.processInstanceId(dto.getProcessInstanceId())
|
||||||
.includeProcessVariables()
|
.includeProcessVariables()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user