diff --git a/src/main/java/com/wflow/workflow/bean/process/ProcessStatus.java b/src/main/java/com/wflow/workflow/bean/process/ProcessStatus.java index 20d482f..1899b46 100644 --- a/src/main/java/com/wflow/workflow/bean/process/ProcessStatus.java +++ b/src/main/java/com/wflow/workflow/bean/process/ProcessStatus.java @@ -2,12 +2,13 @@ package com.wflow.workflow.bean.process; /** * 流程实例状态 + * * @author : willian fu * @since : 2024/5/5 */ public enum ProcessStatus { - PASS, //审批通过 - PRE_RUNNING, //进行中 - PRE_REFUSE, //审批被驳回 + PRE_PASS, //审批通过 + RUNNING, //进行中 + REFUSE, //审批被驳回 PRE_CANCEL //审批撤销 } diff --git a/src/main/java/com/wflow/workflow/config/listener/GlobalTaskListener.java b/src/main/java/com/wflow/workflow/config/listener/GlobalTaskListener.java index 444e001..be8c98e 100644 --- a/src/main/java/com/wflow/workflow/config/listener/GlobalTaskListener.java +++ b/src/main/java/com/wflow/workflow/config/listener/GlobalTaskListener.java @@ -103,7 +103,7 @@ public class GlobalTaskListener extends AbstractFlowableEngineEventListener { .content(StrUtil.builder("您提交的审批【", instance.getProcessDefinitionName(), "】已经通过").toString()) .build()); - runtimeService.updateBusinessStatus(event.getProcessInstanceId(), ProcessStatus.PASS.toString()); + runtimeService.updateBusinessStatus(event.getProcessInstanceId(), ProcessStatus.PRE_PASS.toString()); log.info("[{}]审批流程[{}}]通过", instance.getProcessInstanceId(), instance.getProcessDefinitionName()); super.processCompleted(event); } @@ -116,7 +116,7 @@ public class GlobalTaskListener extends AbstractFlowableEngineEventListener { if (cause instanceof EndEvent){ String endNode = ((EndEvent) cause).getId(); if ("refuse-end".equals(endNode)){ - runtimeService.updateBusinessStatus(event.getProcessInstanceId(), ProcessStatus.PRE_REFUSE.toString()); + runtimeService.updateBusinessStatus(event.getProcessInstanceId(), ProcessStatus.REFUSE.toString()); log.debug("监听到流程[{}]被驳回", event.getProcessInstanceId()); listenerExecutor.doProcessChangeHandler("refuse", event.getProcessInstanceId(), event.getProcessDefinitionId()); } else if ("cancel-end".equals(endNode)) { diff --git a/src/main/java/com/wflow/workflow/service/impl/ProcessInstanceServiceImpl.java b/src/main/java/com/wflow/workflow/service/impl/ProcessInstanceServiceImpl.java index 6286610..7e48ea9 100644 --- a/src/main/java/com/wflow/workflow/service/impl/ProcessInstanceServiceImpl.java +++ b/src/main/java/com/wflow/workflow/service/impl/ProcessInstanceServiceImpl.java @@ -1,5 +1,4 @@ package com.wflow.workflow.service.impl; -import java.util.Date; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; @@ -32,7 +31,6 @@ import com.wflow.workflow.bean.vo.*; import com.wflow.workflow.config.WflowGlobalVarDef; import com.wflow.workflow.service.*; import com.wflow.workflow.utils.Executor; -import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.tenant.TenantContextHolder; import lombok.extern.slf4j.Slf4j; @@ -436,13 +434,13 @@ public class ProcessInstanceServiceImpl implements ProcessInstanceService { if (Objects.equals(customStatus, 1)) { instanceQuery.or().startedBy(userId + "").involvedUser(userId + "").endOr(); } else if (Objects.equals(customStatus, 2)) { - instanceQuery.or().processInstanceBusinessStatus(ProcessStatus.PASS.toString()).processInstanceBusinessStatus(ProcessStatus.PRE_CANCEL.toString()).endOr(); + instanceQuery.or().processInstanceBusinessStatusLike("PRE%").endOr(); } Executor.builder() //customStatus 1待催办2已办结3审批进行中4审批被撤销5审批被驳回 .ifTrueNext(Objects.equals(customStatus, 1), instanceQuery::unfinished) .ifTrueNext(Objects.equals(customStatus, 3), instanceQuery::unfinished) - .ifNotBlankNext(Objects.equals(customStatus, 5) ? ProcessStatus.PRE_REFUSE.toString() : null, instanceQuery::processInstanceBusinessStatus) + .ifNotBlankNext(Objects.equals(customStatus, 5) ? ProcessStatus.REFUSE.toString() : null, instanceQuery::processInstanceBusinessStatus) .ifNotBlankNext(startUser, instanceQuery::startedBy) .ifNotBlankNext(code, instanceQuery::processDefinitionKey) .ifTrueNext(null != startTimes && startTimes.length > 1, () -> { diff --git a/src/main/java/com/wflow/workflow/task/SubProcessInitTask.java b/src/main/java/com/wflow/workflow/task/SubProcessInitTask.java index 1f6b9ee..952598f 100644 --- a/src/main/java/com/wflow/workflow/task/SubProcessInitTask.java +++ b/src/main/java/com/wflow/workflow/task/SubProcessInitTask.java @@ -51,7 +51,7 @@ public class SubProcessInitTask implements JavaDelegate { execution.setVariable("startDept", ownerDto.getOwnerDeptId()); //设置节点流程变量缓存 execution.setVariable(WflowGlobalVarDef.WFLOW_NODE_PROPS, propsMap); - runtimeService.updateBusinessStatus(execution.getProcessInstanceId(), ProcessStatus.PRE_RUNNING.toString()); + runtimeService.updateBusinessStatus(execution.getProcessInstanceId(), ProcessStatus.RUNNING.toString()); log.info("设置子流程{}流程变量[{}, {}]", execution.getProcessInstanceId(), ownerDto.getOwner(), ownerDto.getOwnerDeptId()); } }