hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-02-13 00:54:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

仿钉钉流程设计- 代码评审修改

Browse Source
This commit is contained in:
jason 2024-09-08 17:20:28 +08:00
parent d02e1e1d6b
commit b28d917d56
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmProcessNodeProgressEnum.java
View File

@ -29,7 +29,7 @@ public enum BpmProcessNodeProgressEnum {
USER_TASK_REJECT(31, "审批不通过"), // 审批节点 USER_TASK_REJECT(31, "审批不通过"), // 审批节点
USER_TASK_RETURN(32, "已退回"), // 审批节点 USER_TASK_RETURN(32, "已退回"), // 审批节点
USER_TASK_CANCEL(34, "已取消"), // 审批节点 USER_TASK_CANCEL(34, "已取消"), // 审批节点
// 40 ~ 50 一般节点的接榫状态 // TODO @jason：接榫 是啥呀？ // 40 ~ 50 节点的通用结束状态
FINISHED(41, "已结束"), // 一般节点的节点的结束状态 FINISHED(41, "已结束"), // 一般节点的节点的结束状态
SKIP(42, "跳过"); // 未执行，跳过的节点 SKIP(42, "跳过"); // 未执行，跳过的节点

17
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.bpm.service.task; package cn.iocoder.yudao.module.bpm.service.task;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO;
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.engine.history.HistoricActivityInstance;
import java.util.List; import java.util.List;
@ -54,9 +55,23 @@ public interface BpmActivityService {
Boolean isMultiInstance, Boolean isMultiInstance,
List<HistoricActivityInstance> historicActivityList); List<HistoricActivityInstance> historicActivityList);
// TODO @jason：可以写下这 2 个方法的注释 /**
* 获取未执行活动的进度状态
*
* @param processInstanceStatus 流程实例的状态 {@link BpmProcessInstanceStatusEnum}
* @return 活动的进度状态
*/
Integer getNotRunActivityProgressStatus(Integer processInstanceStatus); Integer getNotRunActivityProgressStatus(Integer processInstanceStatus);
/**
* 获取未执行活动的用户列表
*
* @param processInstanceId 流程实例的编号
* @param processInstanceStatus 流程实例的状态 {@link BpmProcessInstanceStatusEnum}
* @param candidateStrategy 活动的候选人策略
* @param candidateParam 活动的候选人参数
* @return 用户列表
*/
List<BpmProcessInstanceProgressRespVO.User> getNotRunActivityUserList(String processInstanceId, List<BpmProcessInstanceProgressRespVO.User> getNotRunActivityUserList(String processInstanceId,
Integer processInstanceStatus, Integer processInstanceStatus,
Integer candidateStrategy, Integer candidateStrategy,