) sessionManager.getSessionList(userType);
}
if (CollUtil.isEmpty(sessions)) {
- log.info("[send][sessionId({}) userType({}) userId({}) messageType({}) messageContent({}) 未匹配到会话]",
- sessionId, userType, userId, messageType, messageContent);
+ if (log.isDebugEnabled()) {
+ log.debug("[send][sessionId({}) userType({}) userId({}) messageType({}) messageContent({}) 未匹配到会话]",
+ sessionId, userType, userId, messageType, messageContent);
+ }
}
// 2. 执行发送
doSend(sessions, messageType, messageContent);
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java
index 7abb3e1dbc..c00638694a 100644
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java
@@ -7,7 +7,4 @@ package cn.iocoder.yudao.module.bpm.enums;
*/
public interface DictTypeConstants {
- String TASK_ASSIGN_RULE_TYPE = "bpm_task_assign_rule_type"; // 任务分配规则类型
- String TASK_ASSIGN_SCRIPT = "bpm_task_assign_script"; // 任务分配自定义脚本
-
}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
index ec167719cc..6c7a7ce92e 100644
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
@@ -23,6 +23,7 @@ public interface ErrorCodeConstants {
"原因：用户任务({})未配置审批人，请点击【流程设计】按钮，选择该它的【任务（审批人）】进行配置");
ErrorCode MODEL_DEPLOY_FAIL_BPMN_START_EVENT_NOT_EXISTS = new ErrorCode(1_009_002_005, "部署流程失败，原因：BPMN 流程图中，没有开始事件");
ErrorCode MODEL_DEPLOY_FAIL_BPMN_USER_TASK_NAME_NOT_EXISTS = new ErrorCode(1_009_002_006, "部署流程失败，原因：BPMN 流程图中，用户任务({})的名字不存在");
+ ErrorCode MODEL_UPDATE_FAIL_NOT_MANAGER = new ErrorCode(1_009_002_007, "操作流程失败，原因：你不是该流程({})的管理员");
// ========== 流程定义 1-009-003-000 ==========
ErrorCode PROCESS_DEFINITION_KEY_NOT_MATCH = new ErrorCode(1_009_003_000, "流程定义的标识期望是({})，当前是({})，请修改 BPMN 流程图");
@@ -34,15 +35,16 @@ public interface ErrorCodeConstants {
ErrorCode PROCESS_INSTANCE_NOT_EXISTS = new ErrorCode(1_009_004_000, "流程实例不存在");
ErrorCode PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS = new ErrorCode(1_009_004_001, "流程取消失败，流程不处于运行中");
ErrorCode PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF = new ErrorCode(1_009_004_002, "流程取消失败，该流程不是你发起的");
- ErrorCode PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG = new ErrorCode(1_009_004_003, "审批任务({})的审批人未配置");
- ErrorCode PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_EXISTS = new ErrorCode(1_009_004_004, "审批任务({})的审批人({})不存在");
+ ErrorCode PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG = new ErrorCode(1_009_004_003, "任务({})的候选人未配置");
+ ErrorCode PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_EXISTS = new ErrorCode(1_009_004_004, "任务({})的候选人({})不存在");
+ ErrorCode PROCESS_INSTANCE_START_USER_CAN_START = new ErrorCode(1_009_004_005, "发起流程失败，你没有权限发起该流程");
// ========== 流程任务 1-009-005-000 ==========
ErrorCode TASK_OPERATE_FAIL_ASSIGN_NOT_SELF = new ErrorCode(1_009_005_001, "操作失败，原因：该任务的审批人不是你");
ErrorCode TASK_NOT_EXISTS = new ErrorCode(1_009_005_002, "流程任务不存在");
ErrorCode TASK_IS_PENDING = new ErrorCode(1_009_005_003, "当前任务处于挂起状态，不能操作");
ErrorCode TASK_TARGET_NODE_NOT_EXISTS = new ErrorCode(1_009_005_004, " 目标节点不存在");
- ErrorCode TASK_RETURN_FAIL_SOURCE_TARGET_ERROR = new ErrorCode(1_009_005_006, "回退任务失败，目标节点是在并行网关上或非同一路线上，不可跳转");
+ ErrorCode TASK_RETURN_FAIL_SOURCE_TARGET_ERROR = new ErrorCode(1_009_005_006, "退回任务失败，目标节点是在并行网关上或非同一路线上，不可跳转");
ErrorCode TASK_DELEGATE_FAIL_USER_REPEAT = new ErrorCode(1_009_005_007, "任务委派失败，委派人和当前审批人为同一人");
ErrorCode TASK_DELEGATE_FAIL_USER_NOT_EXISTS = new ErrorCode(1_009_005_008, "任务委派失败，被委派人不存在");
ErrorCode TASK_SIGN_CREATE_USER_NOT_EXIST = new ErrorCode(1_009_005_009, "任务加签：选择的用户不存在");
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmBoundaryEventType.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmBoundaryEventType.java
new file mode 100644
index 0000000000..537e03e03c
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmBoundaryEventType.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.bpm.enums.definition;
+
+import cn.hutool.core.util.ArrayUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * BPM 边界事件 (boundary event) 自定义类型枚举
+ *
+ * @author jason
+ */
+@Getter
+@AllArgsConstructor
+public enum BpmBoundaryEventType {
+
+ USER_TASK_TIMEOUT(1,"用户任务超时");
+
+ private final Integer type;
+ private final String name;
+
+ public static BpmBoundaryEventType typeOf(Integer type) {
+ return ArrayUtil.firstMatch(eventType -> eventType.getType().equals(type), values());
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmFieldPermissionEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmFieldPermissionEnum.java
new file mode 100644
index 0000000000..5a9b4b26af
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmFieldPermissionEnum.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.bpm.enums.definition;
+
+import cn.hutool.core.util.ArrayUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * BPM 表单权限的枚举
+ *
+ * @author jason
+ */
+@Getter
+@AllArgsConstructor
+public enum BpmFieldPermissionEnum {
+
+ READ(1, "只读"),
+ WRITE(2, "可编辑"),
+ NONE(3, "隐藏");
+
+ /**
+ * 权限
+ */
+ private final Integer permission;
+ /**
+ * 名字
+ */
+ private final String name;
+
+ public static BpmFieldPermissionEnum valueOf(Integer permission) {
+ return ArrayUtil.firstMatch(item -> item.getPermission().equals(permission), values());
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmModelTypeEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmModelTypeEnum.java
new file mode 100644
index 0000000000..9863a44e87
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmModelTypeEnum.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.bpm.enums.definition;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * BPM 模型的类型的枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum BpmModelTypeEnum implements IntArrayValuable {
+
+ BPMN(10, "BPMN 设计器"), // https://bpmn.io/toolkit/bpmn-js/
+ SIMPLE(20, "SIMPLE 设计器"); // 参考钉钉、飞书工作流的设计器
+
+ public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmModelTypeEnum::getType).toArray();
+
+ private final Integer type;
+ private final String name;
+
+ @Override
+ public int[] array() {
+ return ARRAYS;
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModeConditionType.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModeConditionType.java
new file mode 100644
index 0000000000..234ec7e47b
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModeConditionType.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.bpm.enums.definition;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 仿钉钉的流程器设计器条件节点的条件类型
+ *
+ * @author jason
+ */
+@Getter
+@AllArgsConstructor
+public enum BpmSimpleModeConditionType implements IntArrayValuable {
+
+ EXPRESSION(1, "条件表达式"),
+ RULE(2, "条件规则");
+
+ public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmSimpleModeConditionType::getType).toArray();
+
+ private final Integer type;
+
+ private final String name;
+
+ public static BpmSimpleModeConditionType valueOf(Integer type) {
+ return ArrayUtil.firstMatch(nodeType -> nodeType.getType().equals(type), values());
+ }
+
+ @Override
+ public int[] array() {
+ return ARRAYS;
+ }
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java
new file mode 100644
index 0000000000..4a2e1d50f8
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.bpm.enums.definition;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * 仿钉钉的流程器设计器的模型节点类型
+ *
+ * @author jason
+ */
+@Getter
+@AllArgsConstructor
+public enum BpmSimpleModelNodeType implements IntArrayValuable {
+
+ // 0 ~ 1 开始和结束
+ START_NODE(0, "开始", "startEvent"),
+ END_NODE(1, "结束", "endEvent"),
+
+ // 10 ~ 49 各种节点
+ START_USER_NODE(10, "发起人", "userTask"), // 发起人节点。前端的开始节点，Id 固定
+ APPROVE_NODE(11, "审批人", "userTask"),
+ COPY_NODE(12, "抄送人", "serviceTask"),
+
+ // 50 ~ 条件分支
+ CONDITION_NODE(50, "条件", "sequenceFlow"), // 用于构建流转条件的表达式
+ CONDITION_BRANCH_NODE(51, "条件分支", "exclusiveGateway"),
+ PARALLEL_BRANCH_NODE(52, "并行分支", "parallelGateway"),
+ INCLUSIVE_BRANCH_NODE(53, "包容分支", "inclusiveGateway"),
+ ;
+
+ public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmSimpleModelNodeType::getType).toArray();
+
+ private final Integer type;
+ private final String name;
+ private final String bpmnType;
+
+ /**
+ * 判断是否为分支节点
+ *
+ * @param type 节点类型
+ */
+ public static boolean isBranchNode(Integer type) {
+ return Objects.equals(CONDITION_BRANCH_NODE.getType(), type)
+ || Objects.equals(PARALLEL_BRANCH_NODE.getType(), type)
+ || Objects.equals(INCLUSIVE_BRANCH_NODE.getType(), type);
+ }
+
+ public static BpmSimpleModelNodeType valueOf(Integer type) {
+ return ArrayUtil.firstMatch(nodeType -> nodeType.getType().equals(type), values());
+ }
+
+ @Override
+ public int[] array() {
+ return ARRAYS;
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskApproveMethodEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskApproveMethodEnum.java
new file mode 100644
index 0000000000..1089f181d3
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskApproveMethodEnum.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.bpm.enums.definition;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * BPM 多人审批方式的枚举
+ *
+ * @author jason
+ */
+@Getter
+@AllArgsConstructor
+public enum BpmUserTaskApproveMethodEnum implements IntArrayValuable {
+
+ RANDOM(1, "随机挑选一人审批", null),
+ RATIO(2, "多人会签(按通过比例)", "${ nrOfCompletedInstances/nrOfInstances >= %s}"), // 会签（按通过比例）
+ ANY(3, "多人或签(一人通过或拒绝)", "${ nrOfCompletedInstances > 0 }"), // 或签（通过只需一人，拒绝只需一人）
+ SEQUENTIAL(4, "依次审批", "${ nrOfCompletedInstances >= nrOfInstances }"); // 依次审批
+
+ /**
+ * 审批方式
+ */
+ private final Integer method;
+ /**
+ * 名字
+ */
+ private final String name;
+ /**
+ * 完成表达式
+ */
+ private final String completionCondition;
+
+ public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmUserTaskApproveMethodEnum::getMethod).toArray();
+
+ public static BpmUserTaskApproveMethodEnum valueOf(Integer method) {
+ return ArrayUtil.firstMatch(item -> item.getMethod().equals(method), values());
+ }
+
+ @Override
+ public int[] array() {
+ return ARRAYS;
+ }
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskApproveTypeEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskApproveTypeEnum.java
new file mode 100644
index 0000000000..fa6dba665a
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskApproveTypeEnum.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.bpm.enums.definition;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 用户任务的审批类型枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum BpmUserTaskApproveTypeEnum implements IntArrayValuable {
+
+ USER(1), // 人工审批
+ AUTO_APPROVE(2), // 自动通过
+ AUTO_REJECT(3); // 自动拒绝
+
+ public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmUserTaskApproveTypeEnum::getType).toArray();
+
+ private final Integer type;
+
+ @Override
+ public int[] array() {
+ return ARRAYS;
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskAssignEmptyHandlerTypeEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskAssignEmptyHandlerTypeEnum.java
new file mode 100644
index 0000000000..7a7242a494
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskAssignEmptyHandlerTypeEnum.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.bpm.enums.definition;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+
+/**
+ * BPM 用户任务的审批人为空时，处理类型枚举
+ *
+ * @author 芋道源码
+ */
+@RequiredArgsConstructor
+@Getter
+public enum BpmUserTaskAssignEmptyHandlerTypeEnum implements IntArrayValuable {
+
+ APPROVE(1), // 自动通过
+ REJECT(2), // 自动拒绝
+ ASSIGN_USER(3), // 指定人员审批
+ ASSIGN_ADMIN(4), // 转交给流程管理员
+ ;
+
+ public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmUserTaskAssignEmptyHandlerTypeEnum::getType).toArray();
+
+ private final Integer type;
+
+ @Override
+ public int[] array() {
+ return ARRAYS;
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskAssignStartUserHandlerTypeEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskAssignStartUserHandlerTypeEnum.java
new file mode 100644
index 0000000000..5012815027
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskAssignStartUserHandlerTypeEnum.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.bpm.enums.definition;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+
+/**
+ * BPM 用户任务的审批人与发起人相同时，处理类型枚举
+ *
+ * @author 芋道源码
+ */
+@RequiredArgsConstructor
+@Getter
+public enum BpmUserTaskAssignStartUserHandlerTypeEnum implements IntArrayValuable {
+
+ START_USER_AUDIT(1), // 由发起人对自己审批
+ SKIP(2), // 自动跳过【参考飞书】：1）如果当前节点还有其他审批人，则交由其他审批人进行审批；2）如果当前节点没有其他审批人，则该节点自动通过
+ TRANSFER_DEPT_LEADER(3); // 转交给部门负责人审批【参考飞书】：若部门负责人为空，则自动通过
+
+ public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmUserTaskAssignStartUserHandlerTypeEnum::getType).toArray();
+
+ private final Integer type;
+
+ @Override
+ public int[] array() {
+ return ARRAYS;
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskRejectHandlerType.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskRejectHandlerType.java
new file mode 100644
index 0000000000..f2d48f7d9a
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskRejectHandlerType.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.bpm.enums.definition;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * BPM 用户任务拒绝处理类型枚举
+ *
+ * @author jason
+ */
+@Getter
+@AllArgsConstructor
+public enum BpmUserTaskRejectHandlerType implements IntArrayValuable {
+
+ FINISH_PROCESS_INSTANCE(1, "终止流程"),
+ RETURN_USER_TASK(2, "驳回到指定任务节点");
+
+ private final Integer type;
+ private final String name;
+
+ public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmUserTaskRejectHandlerType::getType).toArray();
+
+ public static BpmUserTaskRejectHandlerType typeOf(Integer type) {
+ return ArrayUtil.firstMatch(item -> item.getType().equals(type), values());
+ }
+
+ @Override
+ public int[] array() {
+ return ARRAYS;
+ }
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskTimeoutHandlerTypeEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskTimeoutHandlerTypeEnum.java
new file mode 100644
index 0000000000..0d56c9b379
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskTimeoutHandlerTypeEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.bpm.enums.definition;
+
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 用户任务超时处理类型枚举
+ *
+ * @author jason
+ */
+@Getter
+@AllArgsConstructor
+public enum BpmUserTaskTimeoutHandlerTypeEnum implements IntArrayValuable {
+
+ REMINDER(1,"自动提醒"),
+ APPROVE(2, "自动同意"),
+ REJECT(3, "自动拒绝");
+
+ private final Integer type;
+ private final String name;
+
+ public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmUserTaskTimeoutHandlerTypeEnum::getType).toArray();
+
+ @Override
+ public int[] array() {
+ return ARRAYS;
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java
index 79001fccd3..abec70276e 100644
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java
@@ -14,7 +14,8 @@ public enum BpmMessageEnum {
PROCESS_INSTANCE_APPROVE("bpm_process_instance_approve"), // 流程任务被审批通过时，发送给申请人
PROCESS_INSTANCE_REJECT("bpm_process_instance_reject"), // 流程任务被审批不通过时，发送给申请人
- TASK_ASSIGNED("bpm_task_assigned"); // 任务被分配时，发送给审批人
+ TASK_ASSIGNED("bpm_task_assigned"), // 任务被分配时，发送给审批人
+ TASK_TIMEOUT("bpm_task_timeout"); // 任务审批超时时，发送给审批人
/**
* 短信模板的标识
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java
index 82a4119b57..29cc1280e2 100644
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.bpm.enums.task;
import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -15,6 +16,7 @@ import java.util.Arrays;
@AllArgsConstructor
public enum BpmProcessInstanceStatusEnum implements IntArrayValuable {
+ NOT_START(-1, "未开始"),
RUNNING(1, "审批中"),
APPROVE(2, "审批通过"),
REJECT(3, "审批不通过"),
@@ -33,7 +35,16 @@ public enum BpmProcessInstanceStatusEnum implements IntArrayValuable {
@Override
public int[] array() {
- return new int[0];
+ return ARRAYS;
+ }
+
+ public static boolean isRejectStatus(Integer status) {
+ return REJECT.getStatus().equals(status);
+ }
+
+ public static boolean isProcessEndStatus(Integer status) {
+ return ObjectUtils.equalsAny(status,
+ APPROVE.getStatus(), REJECT.getStatus(), CANCEL.getStatus());
}
}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmReasonEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmReasonEnum.java
new file mode 100644
index 0000000000..5ea8c41871
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmReasonEnum.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.bpm.enums.task;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 流程实例/任务的的处理原因枚举
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum BpmReasonEnum {
+
+ // ========== 流程实例的独有原因 ==========
+
+ REJECT_TASK("审批不通过任务，原因：{}"), // 场景：用户审批不通过任务。修改文案时，需要注意 isRejectReason 方法
+ CANCEL_PROCESS_INSTANCE_BY_START_USER("用户主动取消流程，原因：{}"), // 场景：用户主动取消流程
+ CANCEL_PROCESS_INSTANCE_BY_ADMIN("管理员【{}】取消流程，原因：{}"), // 场景：管理员取消流程
+
+ // ========== 流程任务的独有原因 ==========
+
+ CANCEL_BY_SYSTEM("系统自动取消"), // 场景：非常多，比如说：1）多任务审批已经满足条件，无需审批该任务；2）流程实例被取消，无需审批该任务；等等
+ TIMEOUT_APPROVE("审批超时，系统自动通过"),
+ TIMEOUT_REJECT("审批超时，系统自动不通过"),
+ ASSIGN_START_USER_APPROVE("审批人与提交人为同一人时，自动通过"),
+ ASSIGN_START_USER_APPROVE_WHEN_SKIP("审批人与提交人为同一人时，自动通过"),
+ ASSIGN_START_USER_APPROVE_WHEN_DEPT_LEADER_NOT_FOUND("审批人与提交人为同一人时，找不到部门负责人，自动通过"),
+ ASSIGN_START_USER_TRANSFER_DEPT_LEADER("审批人与提交人为同一人时，转交给部门负责人审批"),
+ ASSIGN_EMPTY_APPROVE("审批人为空，自动通过"),
+ ASSIGN_EMPTY_REJECT("审批人为空，自动不通过"),
+ APPROVE_TYPE_AUTO_APPROVE("非人工审核，自动通过"),
+ APPROVE_TYPE_AUTO_REJECT("非人工审核，自动不通过"),
+ ;
+
+ private final String reason;
+
+ /**
+ * 格式化理由
+ *
+ * @param args 参数
+ * @return 理由
+ */
+ public String format(Object... args) {
+ return StrUtil.format(reason, args);
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java
index 40a385a582..a19f122bd8 100644
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bpm.enums.task;
+import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -13,13 +14,13 @@ import lombok.Getter;
@AllArgsConstructor
public enum BpmTaskStatusEnum {
+ NOT_START(-1, "未开始"),
RUNNING(1, "审批中"),
APPROVE(2, "审批通过"),
REJECT(3, "审批不通过"),
CANCEL(4, "已取消"),
RETURN(5, "已退回"),
- DELEGATE(6, "委派中"),
/**
* 使用场景：
@@ -44,6 +45,10 @@ public enum BpmTaskStatusEnum {
*/
private final String name;
+ public static boolean isRejectStatus(Integer status) {
+ return REJECT.getStatus().equals(status);
+ }
+
/**
* 判断该状态是否已经处于 End 最终状态
*
@@ -58,4 +63,8 @@ public enum BpmTaskStatusEnum {
RETURN.getStatus(), APPROVING.getStatus());
}
+ public static boolean isCancelStatus(Integer status) {
+ return ObjUtil.equal(status, CANCEL.getStatus());
+ }
+
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/base/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/base/package-info.java
new file mode 100644
index 0000000000..41ce65081f
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/base/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 基础包，放一些通用的 VO 类
+ */
+package cn.iocoder.yudao.module.bpm.controller.admin.base;
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/base/user/UserSimpleBaseVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/base/user/UserSimpleBaseVO.java
new file mode 100644
index 0000000000..b2fb016231
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/base/user/UserSimpleBaseVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.base.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "用户精简信息 VO")
+@Data
+public class UserSimpleBaseVO {
+
+ @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ private Long id;
+ @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+ private String nickname;
+ @Schema(description = "用户头像", example = "https://www.iocoder.cn/1.png")
+ private String avatar;
+
+ @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ private Long deptId;
+ @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
+ private String deptName;
+
+}
\ No newline at end of file
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmCategoryController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmCategoryController.java
index a787905541..43cafaf7fc 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmCategoryController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmCategoryController.java
@@ -48,6 +48,15 @@ public class BpmCategoryController {
return success(true);
}
+ @PutMapping("/update-sort-batch")
+ @Operation(summary = "批量更新流程分类的排序")
+ @Parameter(name = "ids", description = "分类编号列表", required = true, example = "1,2,3")
+ @PreAuthorize("@ss.hasPermission('bpm:category:update')")
+ public CommonResult updateCategorySortBatch(@RequestParam("ids") List ids) {
+ categoryService.updateCategorySortBatch(ids);
+ return success(true);
+ }
+
@DeleteMapping("/delete")
@Operation(summary = "删除流程分类")
@Parameter(name = "id", description = "编号", required = true)
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
index 4095450233..42eab67d53 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
@@ -2,12 +2,9 @@ package cn.iocoder.yudao.module.bpm.controller.admin.definition;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.io.IoUtils;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.*;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelUpdateReqVO;
import cn.iocoder.yudao.module.bpm.convert.definition.BpmModelConvert;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
@@ -15,7 +12,8 @@ import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
-import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,15 +26,15 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
-import java.io.IOException;
-import java.util.HashSet;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - 流程模型")
@RestController
@@ -53,32 +51,42 @@ public class BpmModelController {
@Resource
private BpmProcessDefinitionService processDefinitionService;
- @GetMapping("/page")
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @GetMapping("/list")
@Operation(summary = "获得模型分页")
- public CommonResult> getModelPage(BpmModelPageReqVO pageVO) {
- PageResult pageResult = modelService.getModelPage(pageVO);
- if (CollUtil.isEmpty(pageResult.getList())) {
- return success(PageResult.empty(pageResult.getTotal()));
+ @Parameter(name = "name", description = "模型名称", example = "芋艿")
+ public CommonResult> getModelPage(@RequestParam(value = "name", required = false) String name) {
+ List list = modelService.getModelList(name);
+ if (CollUtil.isEmpty(list)) {
+ return success(Collections.emptyList());
}
- // 拼接数据
// 获得 Form 表单
- Set formIds = convertSet(pageResult.getList(), model -> {
- BpmModelMetaInfoRespDTO metaInfo = JsonUtils.parseObject(model.getMetaInfo(), BpmModelMetaInfoRespDTO.class);
+ Set formIds = convertSet(list, model -> {
+ BpmModelMetaInfoVO metaInfo = BpmModelConvert.INSTANCE.parseMetaInfo(model);
return metaInfo != null ? metaInfo.getFormId() : null;
});
Map formMap = formService.getFormMap(formIds);
// 获得 Category Map
Map categoryMap = categoryService.getCategoryMap(
- convertSet(pageResult.getList(), Model::getCategory));
+ convertSet(list, Model::getCategory));
// 获得 Deployment Map
- Set deploymentIds = new HashSet<>();
- pageResult.getList().forEach(model -> CollectionUtils.addIfNotNull(deploymentIds, model.getDeploymentId()));
- Map deploymentMap = processDefinitionService.getDeploymentMap(deploymentIds);
+ Map deploymentMap = processDefinitionService.getDeploymentMap(
+ convertSet(list, Model::getDeploymentId));
// 获得 ProcessDefinition Map
- List processDefinitions = processDefinitionService.getProcessDefinitionListByDeploymentIds(deploymentIds);
+ List processDefinitions = processDefinitionService.getProcessDefinitionListByDeploymentIds(
+ deploymentMap.keySet());
Map processDefinitionMap = convertMap(processDefinitions, ProcessDefinition::getDeploymentId);
- return success(BpmModelConvert.INSTANCE.buildModelPage(pageResult, formMap, categoryMap, deploymentMap, processDefinitionMap));
+ // 获得 User Map
+ Set userIds = convertSetByFlatMap(list, model -> {
+ BpmModelMetaInfoVO metaInfo = BpmModelConvert.INSTANCE.parseMetaInfo(model);
+ return metaInfo != null ? metaInfo.getStartUserIds().stream() : Stream.empty();
+ });
+ Map userMap = adminUserApi.getUserMap(userIds);
+ return success(BpmModelConvert.INSTANCE.buildModelList(list,
+ formMap, categoryMap, deploymentMap, processDefinitionMap, userMap));
}
@GetMapping("/get")
@@ -97,26 +105,25 @@ public class BpmModelController {
@PostMapping("/create")
@Operation(summary = "新建模型")
@PreAuthorize("@ss.hasPermission('bpm:model:create')")
- public CommonResult createModel(@Valid @RequestBody BpmModelCreateReqVO createRetVO) {
- return success(modelService.createModel(createRetVO, null));
+ public CommonResult createModel(@Valid @RequestBody BpmModelSaveReqVO createRetVO) {
+ return success(modelService.createModel(createRetVO));
}
+
@PutMapping("/update")
@Operation(summary = "修改模型")
@PreAuthorize("@ss.hasPermission('bpm:model:update')")
- public CommonResult updateModel(@Valid @RequestBody BpmModelUpdateReqVO modelVO) {
- modelService.updateModel(modelVO);
+ public CommonResult updateModel(@Valid @RequestBody BpmModelSaveReqVO modelVO) {
+ modelService.updateModel(getLoginUserId(), modelVO);
return success(true);
}
- @PostMapping("/import")
- @Operation(summary = "导入模型")
- @PreAuthorize("@ss.hasPermission('bpm:model:import')")
- public CommonResult importModel(@Valid BpmModeImportReqVO importReqVO) throws IOException {
- BpmModelCreateReqVO createReqVO = BeanUtils.toBean(importReqVO, BpmModelCreateReqVO.class);
- // 读取文件
- String bpmnXml = IoUtils.readUtf8(importReqVO.getBpmnFile().getInputStream(), false);
- return success(modelService.createModel(createReqVO, bpmnXml));
+ @PutMapping("/update-sort-batch")
+ @Operation(summary = "批量修改模型排序")
+ @Parameter(name = "ids", description = "编号数组", required = true, example = "1,2,3")
+ public CommonResult updateModelSortBatch(@RequestParam("ids") List ids) {
+ modelService.updateModelSortBatch(getLoginUserId(), ids);
+ return success(true);
}
@PostMapping("/deploy")
@@ -124,7 +131,7 @@ public class BpmModelController {
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('bpm:model:deploy')")
public CommonResult deployModel(@RequestParam("id") String id) {
- modelService.deployModel(id);
+ modelService.deployModel(getLoginUserId(), id);
return success(true);
}
@@ -132,7 +139,15 @@ public class BpmModelController {
@Operation(summary = "修改模型的状态", description = "实际更新的部署的流程定义的状态")
@PreAuthorize("@ss.hasPermission('bpm:model:update')")
public CommonResult updateModelState(@Valid @RequestBody BpmModelUpdateStateReqVO reqVO) {
- modelService.updateModelState(reqVO.getId(), reqVO.getState());
+ modelService.updateModelState(getLoginUserId(), reqVO.getId(), reqVO.getState());
+ return success(true);
+ }
+
+ @PutMapping("/update-bpmn")
+ @Operation(summary = "修改模型的 BPMN")
+ @PreAuthorize("@ss.hasPermission('bpm:model:update')")
+ public CommonResult updateModelBpmn(@Valid @RequestBody BpmModeUpdateBpmnReqVO reqVO) {
+ modelService.updateModelBpmnXml(reqVO.getId(), reqVO.getBpmnXml());
return success(true);
}
@@ -141,8 +156,25 @@ public class BpmModelController {
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('bpm:model:delete')")
public CommonResult deleteModel(@RequestParam("id") String id) {
- modelService.deleteModel(id);
+ modelService.deleteModel(getLoginUserId(), id);
return success(true);
}
+ // ========== 仿钉钉/飞书的精简模型 =========
+
+ @GetMapping("/simple/get")
+ @Operation(summary = "获得仿钉钉流程设计模型")
+ @Parameter(name = "modelId", description = "流程模型编号", required = true, example = "a2c5eee0-eb6c-11ee-abf4-0c37967c420a")
+ public CommonResult getSimpleModel(@RequestParam("id") String modelId){
+ return success(modelService.getSimpleModel(modelId));
+ }
+
+ @PostMapping("/simple/update")
+ @Operation(summary = "保存仿钉钉流程设计模型")
+ @PreAuthorize("@ss.hasPermission('bpm:model:update')")
+ public CommonResult updateSimpleModel(@Valid @RequestBody BpmSimpleModelUpdateReqVO reqVO) {
+ modelService.updateSimpleModel(getLoginUserId(), reqVO);
+ return success(Boolean.TRUE);
+ }
+
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
index ee23c63e8f..0dc55eb0a5 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
@@ -9,7 +9,6 @@ import cn.iocoder.yudao.module.bpm.convert.definition.BpmProcessDefinitionConver
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
-import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.BpmTaskCandidateStartUserSelectStrategy;
import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
@@ -17,7 +16,6 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.flowable.bpmn.model.BpmnModel;
-import org.flowable.bpmn.model.UserTask;
import org.flowable.engine.repository.Deployment;
import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,6 +32,7 @@ import java.util.Map;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - 流程定义")
@RestController
@@ -77,17 +76,25 @@ public class BpmProcessDefinitionController {
@GetMapping ("/list")
@Operation(summary = "获得流程定义列表")
@Parameter(name = "suspensionState", description = "挂起状态", required = true, example = "1") // 参见 Flowable SuspensionState 枚举
- @PreAuthorize("@ss.hasPermission('bpm:process-definition:query')")
public CommonResult> getProcessDefinitionList(
@RequestParam("suspensionState") Integer suspensionState) {
+ // 1.1 获得开启的流程定义
List list = processDefinitionService.getProcessDefinitionListBySuspensionState(suspensionState);
if (CollUtil.isEmpty(list)) {
return success(Collections.emptyList());
}
-
- // 获得 BpmProcessDefinitionInfoDO Map
+ // 1.2 移除不可见的流程定义
Map processDefinitionMap = processDefinitionService.getProcessDefinitionInfoMap(
convertSet(list, ProcessDefinition::getId));
+ Long userId = getLoginUserId();
+ list.removeIf(processDefinition -> {
+ BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionMap.get(processDefinition.getId());
+ return processDefinitionInfo == null // 不存在
+ || Boolean.FALSE.equals(processDefinitionInfo.getVisible()) // visible 不可见
+ || !processDefinitionService.canUserStartProcessDefinition(processDefinitionInfo, userId); // 无权限发起
+ });
+
+ // 2. 拼接 VO 返回
return success(BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinitionList(
list, null, processDefinitionMap, null, null));
}
@@ -96,7 +103,6 @@ public class BpmProcessDefinitionController {
@Operation(summary = "获得流程定义")
@Parameter(name = "id", description = "流程编号", required = true, example = "1024")
@Parameter(name = "key", description = "流程定义标识", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:process-definition:query')")
public CommonResult getProcessDefinition(
@RequestParam(value = "id", required = false) String id,
@RequestParam(value = "key", required = false) String key) {
@@ -105,10 +111,10 @@ public class BpmProcessDefinitionController {
if (processDefinition == null) {
return success(null);
}
+ BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(processDefinition.getId());
BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processDefinition.getId());
- List userTaskList = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectUserTaskList(bpmnModel);
return success(BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinition(
- processDefinition, null, null, null, null, bpmnModel, userTaskList));
+ processDefinition, null, processDefinitionInfo, null, null, bpmnModel));
}
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeUpdateBpmnReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeUpdateBpmnReqVO.java
new file mode 100644
index 0000000000..053583d4f0
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeUpdateBpmnReqVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Schema(description = "管理后台 - 流程模型的更新 BPMN XML Request VO")
+@Data
+public class BpmModeUpdateBpmnReqVO {
+
+ @Schema(description = "流程编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotEmpty(message = "流程编号不能为空")
+ private String id;
+
+ @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "BPMN XML 不能为空")
+ private String bpmnXml;
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
new file mode 100644
index 0000000000..4f5e75a8e5
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
+
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum;
+import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.URL;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * BPM 流程 MetaInfo Response DTO
+ * 主要用于 { Model#setMetaInfo(String)} 的存储
+ *
+ * 最终，它的字段和
+ * {@link cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO}
+ * 是一致的
+ *
+ * @author 芋道源码
+ */
+@Data
+public class BpmModelMetaInfoVO {
+
+ @Schema(description = "流程图标", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/yudao.jpg")
+ @NotEmpty(message = "流程图标不能为空")
+ @URL(message = "流程图标格式不正确")
+ private String icon;
+
+ @Schema(description = "流程描述", example = "我是描述")
+ private String description;
+
+ @Schema(description = "流程类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+ @InEnum(BpmModelTypeEnum.class)
+ @NotNull(message = "流程类型不能为空")
+ private Integer type;
+
+ @Schema(description = "表单类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+ @InEnum(BpmModelFormTypeEnum.class)
+ @NotNull(message = "表单类型不能为空")
+ private Integer formType;
+ @Schema(description = "表单编号", example = "1024")
+ private Long formId; // formType 为 NORMAL 使用，必须非空
+ @Schema(description = "自定义表单的提交路径，使用 Vue 的路由地址", example = "/bpm/oa/leave/create")
+ private String formCustomCreatePath; // 表单类型为 CUSTOM 时，必须非空
+ @Schema(description = "自定义表单的查看路径，使用 Vue 的路由地址", example = "/bpm/oa/leave/view")
+ private String formCustomViewPath; // 表单类型为 CUSTOM 时，必须非空
+
+ @Schema(description = "是否可见", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+ @NotNull(message = "是否可见不能为空")
+ private Boolean visible;
+
+ @Schema(description = "可发起用户编号数组", example = "[1,2,3]")
+ private List startUserIds;
+
+ @Schema(description = "可管理用户编号数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "[2,4,6]")
+ @NotEmpty(message = "可管理用户编号数组不能为空")
+ private List managerUserIds;
+
+ @Schema(description = "排序", example = "1")
+ private Long sort; // 创建时，后端自动生成
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java
index aad2015c7e..c828b64638 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java
@@ -1,14 +1,16 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
+import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
+import java.util.List;
@Schema(description = "管理后台 - 流程模型 Response VO")
@Data
-public class BpmModelRespVO {
+public class BpmModelRespVO extends BpmModelMetaInfoVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id;
@@ -22,33 +24,23 @@ public class BpmModelRespVO {
@Schema(description = "流程图标", example = "https://www.iocoder.cn/yudao.jpg")
private String icon;
- @Schema(description = "流程描述", example = "我是描述")
- private String description;
-
@Schema(description = "流程分类编码", example = "1")
private String category;
@Schema(description = "流程分类名字", example = "请假")
private String categoryName;
- @Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
- private Integer formType;
-
- @Schema(description = "表单编号", example = "1024")
- private Long formId; // 在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空
@Schema(description = "表单名字", example = "请假表单")
private String formName;
- @Schema(description = "自定义表单的提交路径", example = "/bpm/oa/leave/create")
- private String formCustomCreatePath; // 使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空
- @Schema(description = "自定义表单的查看路径", example = "/bpm/oa/leave/view")
- private String formCustomViewPath; // ，使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空
-
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
private String bpmnXml;
+ @Schema(description = "可发起的用户数组")
+ private List startUsers;
+
/**
* 最新部署的流程定义
*/
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
new file mode 100644
index 0000000000..6f91f158f2
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Schema(description = "管理后台 - 流程模型的保存 Request VO")
+@Data
+public class BpmModelSaveReqVO extends BpmModelMetaInfoVO {
+
+ @Schema(description = "编号", example = "1024")
+ private String id;
+
+ @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_yudao")
+ @NotEmpty(message = "流程标识不能为空")
+ private String key;
+
+ @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+ @NotEmpty(message = "流程名称不能为空")
+ private String name;
+
+ @Schema(description = "流程分类", example = "1")
+ private String category;
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
new file mode 100644
index 0000000000..b94fa9622f
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
@@ -0,0 +1,212 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple;
+
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.bpm.enums.definition.*;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.util.Map;
+
+@Schema(description = "管理后台 - 仿钉钉流程设计模型节点 VO")
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BpmSimpleModelNodeVO {
+
+ @Schema(description = "模型节点编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartEvent_1")
+ @NotEmpty(message = "模型节点编号不能为空")
+ private String id;
+
+ @Schema(description = "模型节点类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "模型节点类型不能为空")
+ @InEnum(BpmSimpleModelNodeType.class)
+ private Integer type;
+
+ @Schema(description = "模型节点名称", example = "领导审批")
+ private String name;
+
+ @Schema(description = "节点展示内容", example = "指定成员: 芋道源码")
+ private String showText;
+
+ @Schema(description = "子节点")
+ private BpmSimpleModelNodeVO childNode; // 补充说明：在该模型下，子节点有且仅有一个，不会有多个
+
+ @Schema(description = "条件节点")
+ private List conditionNodes; // 补充说明：有且仅有条件、并行、包容等分支会使用
+
+ @Schema(description = "条件类型", example = "1")
+ @InEnum(BpmSimpleModeConditionType.class)
+ private Integer conditionType; // 仅用于条件节点 BpmSimpleModelNodeType.CONDITION_NODE
+
+ @Schema(description = "条件表达式", example = "${day>3}")
+ private String conditionExpression; // 仅用于条件节点 BpmSimpleModelNodeType.CONDITION_NODE
+
+ @Schema(description = "是否默认条件", example = "true")
+ private Boolean defaultFlow; // 仅用于条件节点 BpmSimpleModelNodeType.CONDITION_NODE
+ /**
+ * 条件组
+ */
+ private ConditionGroups conditionGroups; // 仅用于条件节点 BpmSimpleModelNodeType.CONDITION_NODE
+
+ @Schema(description = "候选人策略", example = "30")
+ @InEnum(BpmTaskCandidateStrategyEnum.class)
+ private Integer candidateStrategy; // 用于审批，抄送节点
+
+ @Schema(description = "候选人参数")
+ private String candidateParam; // 用于审批，抄送节点
+
+ @Schema(description = "审批节点类型", example = "1")
+ @InEnum(BpmUserTaskApproveTypeEnum.class)
+ private Integer approveType; // 用于审批节点
+
+ @Schema(description = "多人审批方式", example = "1")
+ @InEnum(BpmUserTaskApproveMethodEnum.class)
+ private Integer approveMethod; // 用于审批节点
+
+ @Schema(description = "通过比例", example = "100")
+ private Integer approveRatio; // 通过比例，当多人审批方式为：多人会签(按通过比例) 需要设置
+
+ @Schema(description = "表单权限", example = "[]")
+ private List> fieldsPermission;
+
+ @Schema(description = "操作按钮设置", example = "[]")
+ private List buttonsSetting; // 用于审批节点
+
+ /**
+ * 审批节点拒绝处理
+ */
+ private RejectHandler rejectHandler;
+
+ /**
+ * 审批节点超时处理
+ */
+ private TimeoutHandler timeoutHandler;
+
+ @Schema(description = "审批节点的审批人与发起人相同时，对应的处理类型", example = "1")
+ @InEnum(BpmUserTaskAssignStartUserHandlerTypeEnum.class)
+ private Integer assignStartUserHandlerType;
+
+ /**
+ * 空处理策略
+ */
+ private AssignEmptyHandler assignEmptyHandler;
+
+ @Schema(description = "审批节点拒绝处理策略")
+ @Data
+ public static class RejectHandler {
+
+ @Schema(description = "拒绝处理类型", example = "1")
+ @InEnum(BpmUserTaskRejectHandlerType.class)
+ private Integer type;
+
+ @Schema(description = "任务拒绝后驳回的节点 Id", example = "Activity_1")
+ private String returnNodeId;
+ }
+
+ @Schema(description = "审批节点超时处理策略")
+ @Valid
+ @Data
+ public static class TimeoutHandler {
+
+ @Schema(description = "是否开启超时处理", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
+ @NotNull(message = "是否开启超时处理不能为空")
+ private Boolean enable;
+
+ @Schema(description = "任务超时未处理的行为", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "任务超时未处理的行为不能为空")
+ @InEnum(BpmUserTaskTimeoutHandlerTypeEnum.class)
+ private Integer type;
+
+ @Schema(description = "超时时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "PT6H")
+ @NotEmpty(message = "超时时间不能为空")
+ private String timeDuration;
+
+ @Schema(description = "最大提醒次数", example = "1")
+ private Integer maxRemindCount;
+
+ }
+
+ @Schema(description = "空处理策略")
+ @Data
+ @Valid
+ public static class AssignEmptyHandler {
+
+ @Schema(description = "空处理类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "空处理类型不能为空")
+ @InEnum(BpmUserTaskAssignEmptyHandlerTypeEnum.class)
+ private Integer type;
+
+ @Schema(description = "指定人员审批的用户编号数组", example = "1")
+ private List userIds;
+
+ }
+
+ @Schema(description = "操作按钮设置")
+ @Data
+ @Valid
+ public static class OperationButtonSetting {
+
+ // TODO @jason：是不是按钮的标识？id 会和数据库的 id 自增有点模糊，key 标识会更合理一点点哈。
+ @Schema(description = "按钮 Id", example = "1")
+ private Integer id;
+
+ @Schema(description = "显示名称", example = "审批")
+ private String displayName;
+
+ @Schema(description = "是否启用", example = "true")
+ private Boolean enable;
+ }
+
+ @Schema(description = "条件组")
+ @Data
+ @Valid
+ public static class ConditionGroups {
+
+ @Schema(description = "条件组下的条件关系是否为与关系", example = "true")
+ @NotNull(message = "条件关系不能为空")
+ private Boolean and;
+
+ @Schema(description = "条件组下的条件", example = "[]")
+ @NotEmpty(message = "条件不能为空")
+ private List conditions;
+ }
+
+ @Schema(description = "条件")
+ @Data
+ @Valid
+ public static class Condition {
+
+ @Schema(description = "条件下的规则关系是否为与关系", example = "true")
+ @NotNull(message = "规则关系不能为空")
+ private Boolean and;
+
+ @Schema(description = "条件下的规则", example = "[]")
+ @NotEmpty(message = "规则不能为空")
+ private List rules;
+ }
+
+ @Schema(description = "条件规则")
+ @Data
+ @Valid
+ public static class ConditionRule {
+
+ @Schema(description = "运行符号", example = "==")
+ @NotEmpty(message = "运行符号不能为空")
+ private String opCode;
+
+ @Schema(description = "运算符左边的值,例如某个流程变量", example = "startUserId")
+ @NotEmpty(message = "运算符左边的值不能为空")
+ private String leftSide;
+
+ @Schema(description = "运算符右边的值", example = "1")
+ @NotEmpty(message = "运算符右边的值不能为空")
+ private String rightSide;
+ }
+
+ // TODO @芋艿：条件；建议可以固化的一些选项；然后有个表达式兜底；要支持
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelUpdateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelUpdateReqVO.java
new file mode 100644
index 0000000000..c3a525ae60
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelUpdateReqVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+// TODO @jason：需要考虑，如果某个节点的配置不正确，需要有提示；具体怎么实现，可以讨论下；
+@Schema(description = "管理后台 - 仿钉钉流程设计模型的新增/修改 Request VO")
+@Data
+public class BpmSimpleModelUpdateReqVO {
+
+ @Schema(description = "流程模型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotEmpty(message = "流程模型编号不能为空")
+ private String id; // 对应 Flowable act_re_model 表 ID_ 字段
+
+ @Schema(description = "仿钉钉流程设计模型对象", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "仿钉钉流程设计模型对象不能为空")
+ @Valid
+ private BpmSimpleModelNodeVO simpleModel;
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java
index 2fb8dd4dcb..1e9dfc8207 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java
@@ -33,6 +33,9 @@ public class BpmProcessDefinitionRespVO {
@Schema(description = "流程分类名字", example = "请假")
private String categoryName;
+ @Schema(description = "流程模型的类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+ private Integer modelType; // 参见 BpmModelTypeEnum 枚举类
+
@Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
private Integer formType;
@Schema(description = "表单编号-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空", example = "1024")
@@ -59,9 +62,12 @@ public class BpmProcessDefinitionRespVO {
@Schema(description = "BPMN XML")
private String bpmnXml; // 需要从对应的 BpmnModel 读取，非必须返回
- @Schema(description = "发起用户需要选择审批人的任务数组")
- private List startUserSelectTasks; // 需要从对应的 BpmnModel 读取，非必须返回
+ @Schema(description = "SIMPLE 设计器模型数据 json 格式")
+ private String simpleModel; // 非必须返回
+ @Schema(description = "流程定义排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ private Long sort;
+
@Schema(description = "BPMN UserTask 用户任务")
@Data
public static class UserTask {
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.http b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.http
new file mode 100644
index 0000000000..c69082725a
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.http
@@ -0,0 +1,16 @@
+### 请求 /bpm/process-instance/get-bpmn 接口 => 成功
+GET {{baseUrl}}/bpm/process-instance/get-bpmn-model-view?id=1d5fb5a6-85f8-11ef-b717-7e93075f94e3
+Content-Type: application/json
+tenant-id: 1
+Authorization: Bearer {{token}}
+
+### 请求 /bpm/process-instance/get-bpmn 接口 => 失败
+#GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processInstanceId=1d5fb5a6-85f8-11ef-b717-7e93075f94e3
+#GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processInstanceId=3ee5c5ba-904a-11ef-a76e-b2ed5d6ef911
+#GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processInstanceId=f630dfa2-8f92-11ef-947c-ba5e239a6eb4
+#GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processInstanceId=9de8bdbf-9133-11ef-ae97-eaf49df1f932
+#GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processInstanceId=dd2188eb-9394-11ef-a039-7a9ac3d9eb6b
+GET {{baseUrl}}/bpm/process-instance/get-approval-detail?processDefinitionId=test-auto:1:c70a799a-9394-11ef-a039-7a9ac3d9eb6b
+Content-Type: application/json
+tenant-id: 1
+Authorization: Bearer {{token}}
\ No newline at end of file
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
index 52198fe917..c6bbade1ac 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
@@ -4,14 +4,10 @@ import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCancelReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCreateReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstancePageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*;
import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
-import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
@@ -131,15 +127,13 @@ public class BpmProcessInstanceController {
processInstance.getProcessDefinitionId());
BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(
processInstance.getProcessDefinitionId());
- String bpmnXml = BpmnModelUtils.getBpmnXml(
- processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId()));
AdminUserRespDTO startUser = adminUserApi.getUser(NumberUtils.parseLong(processInstance.getStartUserId()));
DeptRespDTO dept = null;
- if (startUser != null) {
+ if (startUser != null && startUser.getDeptId() != null) {
dept = deptApi.getDept(startUser.getDeptId());
}
return success(BpmProcessInstanceConvert.INSTANCE.buildProcessInstance(processInstance,
- processDefinition, processDefinitionInfo, bpmnXml, startUser, dept));
+ processDefinition, processDefinitionInfo, startUser, dept));
}
@DeleteMapping("/cancel-by-start-user")
@@ -160,4 +154,19 @@ public class BpmProcessInstanceController {
return success(true);
}
+ @GetMapping("/get-approval-detail")
+ @Operation(summary = "获得审批详情")
+ @Parameter(name = "id", description = "流程实例的编号", required = true)
+ @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
+ public CommonResult getApprovalDetail(@Valid BpmApprovalDetailReqVO reqVO) {
+ return success(processInstanceService.getApprovalDetail(getLoginUserId(), reqVO));
+ }
+
+ @GetMapping("/get-bpmn-model-view")
+ @Operation(summary = "获取流程实例的 BPMN 模型视图", description = "在【流程详细】界面中，进行调用")
+ @Parameter(name = "id", description = "流程实例的编号", required = true)
+ public CommonResult getProcessInstanceBpmnModelView(@RequestParam(value = "id") String id) {
+ return success(processInstanceService.getProcessInstanceBpmnModelView(id));
+ }
+
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceCopyController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceCopyController.java
index cfd2f963da..bcc24fccc8 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceCopyController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceCopyController.java
@@ -6,12 +6,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.date.DateUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.cc.BpmProcessInstanceCopyRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCopyPageReqVO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceCopyDO;
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceCopyService;
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
-import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -29,8 +29,7 @@ import java.util.Map;
import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertListByFlatMap;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - 流程实例抄送")
@@ -43,8 +42,6 @@ public class BpmProcessInstanceCopyController {
private BpmProcessInstanceCopyService processInstanceCopyService;
@Resource
private BpmProcessInstanceService processInstanceService;
- @Resource
- private BpmTaskService taskService;
@Resource
private AdminUserApi adminUserApi;
@@ -61,18 +58,19 @@ public class BpmProcessInstanceCopyController {
}
// 拼接返回
- Map taskNameMap = taskService.getTaskNameByTaskIds(
- convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getTaskId));
Map processInstanceMap = processInstanceService.getHistoricProcessInstanceMap(
convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getProcessInstanceId));
Map userMap = adminUserApi.getUserMap(convertListByFlatMap(pageResult.getList(),
copy -> Stream.of(copy.getStartUserId(), Long.parseLong(copy.getCreator()))));
- return success(BeanUtils.toBean(pageResult, BpmProcessInstanceCopyRespVO.class, copyVO -> {
- MapUtils.findAndThen(userMap, Long.valueOf(copyVO.getCreator()), user -> copyVO.setCreatorName(user.getNickname()));
- MapUtils.findAndThen(userMap, copyVO.getStartUserId(), user -> copyVO.setStartUserName(user.getNickname()));
- MapUtils.findAndThen(taskNameMap, copyVO.getTaskId(), copyVO::setTaskName);
+ return success(convertPage(pageResult, copy -> {
+ BpmProcessInstanceCopyRespVO copyVO = BeanUtils.toBean(copy, BpmProcessInstanceCopyRespVO.class);
+ MapUtils.findAndThen(userMap, Long.valueOf(copy.getCreator()),
+ user -> copyVO.setStartUser(BeanUtils.toBean(user, UserSimpleBaseVO.class)));
+ MapUtils.findAndThen(userMap, copy.getStartUserId(),
+ user -> copyVO.setCreateUser(BeanUtils.toBean(user, UserSimpleBaseVO.class)));
MapUtils.findAndThen(processInstanceMap, copyVO.getProcessInstanceId(),
processInstance -> copyVO.setProcessInstanceStartTime(DateUtils.of(processInstance.getStartTime())));
+ return copyVO;
}));
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
index d299fd6eb9..40dcd63c51 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
@@ -117,24 +117,21 @@ public class BpmTaskController {
@PreAuthorize("@ss.hasPermission('bpm:task:query')")
public CommonResult> getTaskListByProcessInstanceId(
@RequestParam("processInstanceId") String processInstanceId) {
- List taskList = taskService.getTaskListByProcessInstanceId(processInstanceId);
+ List taskList = taskService.getTaskListByProcessInstanceId(processInstanceId, true);
if (CollUtil.isEmpty(taskList)) {
return success(Collections.emptyList());
}
// 拼接数据
- HistoricProcessInstance processInstance = processInstanceService.getHistoricProcessInstance(processInstanceId);
- // 获得 User 和 Dept Map
Set userIds = convertSetByFlatMap(taskList, task ->
Stream.of(NumberUtils.parseLong(task.getAssignee()), NumberUtils.parseLong(task.getOwner())));
- userIds.add(NumberUtils.parseLong(processInstance.getStartUserId()));
Map userMap = adminUserApi.getUserMap(userIds);
Map deptMap = deptApi.getDeptMap(
convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
// 获得 Form Map
Map formMap = formService.getFormMap(
convertSet(taskList, task -> NumberUtils.parseLong(task.getFormKey())));
- return success(BpmTaskConvert.INSTANCE.buildTaskListByProcessInstanceId(taskList, processInstance,
+ return success(BpmTaskConvert.INSTANCE.buildTaskListByProcessInstanceId(taskList,
formMap, userMap, deptMap));
}
@@ -155,7 +152,7 @@ public class BpmTaskController {
}
@GetMapping("/list-by-return")
- @Operation(summary = "获取所有可回退的节点", description = "用于【流程详情】的【回退】按钮")
+ @Operation(summary = "获取所有可退回的节点", description = "用于【流程详情】的【退回】按钮")
@Parameter(name = "taskId", description = "当前任务ID", required = true)
@PreAuthorize("@ss.hasPermission('bpm:task:update')")
public CommonResult> getTaskListByReturn(@RequestParam("id") String id) {
@@ -165,7 +162,7 @@ public class BpmTaskController {
}
@PutMapping("/return")
- @Operation(summary = "回退任务", description = "用于【流程详情】的【回退】按钮")
+ @Operation(summary = "退回任务", description = "用于【流程详情】的【退回】按钮")
@PreAuthorize("@ss.hasPermission('bpm:task:update')")
public CommonResult returnTask(@Valid @RequestBody BpmTaskReturnReqVO reqVO) {
taskService.returnTask(getLoginUserId(), reqVO);
@@ -204,6 +201,14 @@ public class BpmTaskController {
return success(true);
}
+ @PutMapping("/copy")
+ @Operation(summary = "抄送任务")
+ @PreAuthorize("@ss.hasPermission('bpm:task:update')")
+ public CommonResult copyTask(@Valid @RequestBody BpmTaskCopyReqVO reqVO) {
+ taskService.copyTask(getLoginUserId(), reqVO);
+ return success(true);
+ }
+
@GetMapping("/list-by-parent-task-id")
@Operation(summary = "获得指定父级任务的子任务列表") // 目前用于，减签的时候，获得子任务列表
@Parameter(name = "parentTaskId", description = "父级任务编号", required = true)
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/cc/BpmProcessInstanceCopyRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/cc/BpmProcessInstanceCopyRespVO.java
index 4b397fc1c7..b087c3a441 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/cc/BpmProcessInstanceCopyRespVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/cc/BpmProcessInstanceCopyRespVO.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.cc;
+import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -12,29 +13,31 @@ public class BpmProcessInstanceCopyRespVO {
@Schema(description = "抄送主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id;
- @Schema(description = "发起人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "888")
- private Long startUserId;
- @Schema(description = "发起人昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- private String startUserName;
+ @Schema(description = "发起人", requiredMode = Schema.RequiredMode.REQUIRED)
+ private UserSimpleBaseVO startUser;
@Schema(description = "流程实例编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "A233")
private String processInstanceId;
- @Schema(description = "流程实例的名称")
+ @Schema(description = "流程实例的名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试")
private String processInstanceName;
- @Schema(description = "流程实例的发起时间")
+ @Schema(description = "流程实例的发起时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime processInstanceStartTime;
- @Schema(description = "发起抄送的任务编号")
+ @Schema(description = "流程活动的编号", requiredMode = Schema.RequiredMode.REQUIRED)
+ private String activityId;
+ @Schema(description = "流程活动的名字", requiredMode = Schema.RequiredMode.REQUIRED)
+ private String activityName;
+
+ @Schema(description = "流程活动的编号")
private String taskId;
- @Schema(description = "发起抄送的任务名称")
- private String taskName;
- @Schema(description = "抄送人")
- private String creator;
- @Schema(description = "抄送人昵称")
- private String creatorName;
+ @Schema(description = "抄送人意见")
+ private String reason;
+
+ @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
+ private UserSimpleBaseVO createUser;
- @Schema(description = "抄送时间")
+ @Schema(description = "抄送时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailReqVO.java
new file mode 100644
index 0000000000..68cb1a5b58
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailReqVO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
+
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.AssertTrue;
+import java.util.Map;
+
+@Schema(description = "管理后台 - 审批详情 Request VO")
+@Data
+public class BpmApprovalDetailReqVO {
+
+ @Schema(description = "流程定义的编号", example = "1024")
+ private String processDefinitionId; // 使用场景：发起流程时，传流程定义 ID
+
+ @Schema(description = "流程变量")
+ private Map processVariables; // 使用场景：同 processDefinitionId，用于流程预测
+
+ @Schema(description = "流程实例的编号", example = "1024")
+ private String processInstanceId; // 使用场景：流程已发起时候传流程实例 ID
+
+ // TODO @芋艿：如果未来 BPMN 增加流程图，它没有发起人节点，会有问题。
+ @Schema(description = "流程活动编号", example = "StartUserNode")
+ private String activityId; // 用于获取表单权限。1）发起流程时，传“发起人节点” activityId 可获取发起人的表单权限；2）从抄送列表界面进来时，传抄送的 activityId 可获取抄送人的表单权限；
+
+ @Schema(description = "流程任务编号", example = "95f2f08b-621b-11ef-bf39-00ff4722db8b")
+ private String taskId; // 用于获取表单权限。1）从待审批/已审批界面进来时，传递 taskId 任务编号，可获取任务节点的变得权限
+
+ @AssertTrue(message = "流程定义的编号和流程实例的编号不能同时为空")
+ @JsonIgnore
+ public boolean isValidProcessParam() {
+ return StrUtil.isNotEmpty(processDefinitionId) || StrUtil.isNotEmpty(processInstanceId);
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailRespVO.java
new file mode 100644
index 0000000000..148175d938
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailRespVO.java
@@ -0,0 +1,106 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+
+@Schema(description = "管理后台 - 审批详情 Response VO")
+@Data
+public class BpmApprovalDetailRespVO {
+
+ @Schema(description = "流程实例的状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ private Integer status; // 参见 BpmProcessInstanceStatusEnum 枚举
+
+ @Schema(description = "活动节点列表", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List activityNodes;
+
+ @Schema(description = "表单字段权限")
+ private Map formFieldsPermission;
+
+ @Schema(description = "待办任务")
+ private BpmTaskRespVO todoTask;
+
+ /**
+ * 所属流程定义信息
+ */
+ private BpmProcessDefinitionRespVO processDefinition;
+
+ /**
+ * 所属流程实例信息
+ */
+ private BpmProcessInstanceRespVO processInstance;
+
+ @Schema(description = "活动节点信息")
+ @Data
+ public static class ActivityNode {
+
+ @Schema(description = "节点编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartUserNode")
+ private String id;
+
+ @Schema(description = "节点名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "发起人")
+ private String name;
+
+ @Schema(description = "节点类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ private Integer nodeType; // 参见 BpmSimpleModelNodeType 枚举
+
+ @Schema(description = "节点状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+ private Integer status; // 参见 BpmTaskStatusEnum 枚举
+
+ @Schema(description = "节点的开始时间")
+ private LocalDateTime startTime;
+ @Schema(description = "节点的结束时间")
+ private LocalDateTime endTime;
+
+ @Schema(description = "审批节点的任务信息")
+ private List tasks;
+
+ @Schema(description = "候选人策略", example = "35")
+ private Integer candidateStrategy; // 参见 BpmTaskCandidateStrategyEnum 枚举。主要用于发起时，审批节点、抄送节点自选
+
+ @Schema(description = "候选人用户 ID 列表", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "1818")
+ @JsonIgnore // 不返回，只是方便后续读取，赋值给 candidateUsers
+ private List candidateUserIds;
+
+ @Schema(description = "候选人用户列表")
+ private List candidateUsers; // 只包含未生成 ApprovalTaskInfo 的用户列表
+
+ }
+
+ @Schema(description = "活动节点的任务信息")
+ @Data
+ public static class ActivityNodeTask {
+
+ @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ private String id;
+
+ @Schema(description = "任务所属人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "1818")
+ @JsonIgnore // 不返回，只是方便后续读取，赋值给 ownerUser
+ private Long owner;
+
+ @Schema(description = "任务所属人", example = "1024")
+ private UserSimpleBaseVO ownerUser;
+
+ @Schema(description = "任务分配人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048")
+ @JsonIgnore // 不返回，只是方便后续读取，赋值给 assigneeUser
+ private Long assignee;
+
+ @Schema(description = "任务分配人", example = "2048")
+ private UserSimpleBaseVO assigneeUser;
+
+ @Schema(description = "任务状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ private Integer status; // 参见 BpmTaskStatusEnum 枚举
+
+ @Schema(description = "审批意见", example = "同意")
+ private String reason;
+
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceBpmnModelViewRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceBpmnModelViewRespVO.java
new file mode 100644
index 0000000000..5f9c0f37df
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceBpmnModelViewRespVO.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Set;
+
+@Schema(description = "管理后台 - 流程示例的 BPMN 视图 Response VO")
+@Data
+public class BpmProcessInstanceBpmnModelViewRespVO {
+
+ // ========== 基本信息 ==========
+
+ @Schema(description = "流程实例信息", requiredMode = Schema.RequiredMode.REQUIRED)
+ private BpmProcessInstanceRespVO processInstance;
+
+ @Schema(description = "任务列表", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List tasks;
+
+ @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
+ private String bpmnXml;
+
+ @Schema(description = "SIMPLE 模型")
+ private BpmSimpleModelNodeVO simpleModel;
+
+ // ========== 进度信息 ==========
+
+ @Schema(description = "进行中的活动节点编号集合", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Set unfinishedTaskActivityIds; // 只包括 UserTask
+
+ @Schema(description = "已经完成的活动节点编号集合", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Set finishedTaskActivityIds; // 包括 UserTask、Gateway 等，不包括 SequenceFlow
+
+ @Schema(description = "已经完成的连线节点编号集合", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Set finishedSequenceFlowActivityIds; // 只包括 SequenceFlow
+
+ @Schema(description = "已经拒绝的活动节点编号集合", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Set rejectedTaskActivityIds; // 只包括 UserTask
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageReqVO.java
index bc658eb874..dbd314c099 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageReqVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageReqVO.java
@@ -18,8 +18,8 @@ public class BpmProcessInstancePageReqVO extends PageParam {
@Schema(description = "流程名称", example = "芋道")
private String name;
- @Schema(description = "流程定义的编号", example = "2048")
- private String processDefinitionId;
+ @Schema(description = "流程定义的标识", example = "2048")
+ private String processDefinitionKey; // 精准匹配
@Schema(description = "流程实例的状态", example = "1")
@InEnum(BpmProcessInstanceStatusEnum.class)
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java
index ac6b90c7e1..2de0cbc956 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
+import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -44,7 +45,7 @@ public class BpmProcessInstanceRespVO {
/**
* 发起流程的用户
*/
- private User startUser;
+ private UserSimpleBaseVO startUser;
@Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
private String processDefinitionId;
@@ -58,22 +59,6 @@ public class BpmProcessInstanceRespVO {
*/
private List tasks; // 仅在流程实例分页才返回
- @Schema(description = "用户信息")
- @Data
- public static class User {
-
- @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long id;
- @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
- private String nickname;
-
- @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long deptId;
- @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
- private String deptName;
-
- }
-
@Schema(description = "流程任务")
@Data
public static class Task {
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
index 5d35a0e815..a6cbff2c4d 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
@@ -4,7 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
-import java.util.Collection;
import java.util.Map;
@Schema(description = "管理后台 - 通过流程任务的 Request VO")
@@ -19,9 +18,6 @@ public class BpmTaskApproveReqVO {
@NotEmpty(message = "审批意见不能为空")
private String reason;
- @Schema(description = "抄送的用户编号数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2")
- private Collection copyUserIds;
-
@Schema(description = "变量实例（动态表单）", requiredMode = Schema.RequiredMode.REQUIRED)
private Map variables;
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskCopyReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskCopyReqVO.java
new file mode 100644
index 0000000000..e7c88d56f6
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskCopyReqVO.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Collection;
+
+@Schema(description = "管理后台 - 抄送流程任务的 Request VO")
+@Data
+public class BpmTaskCopyReqVO {
+
+ @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotEmpty(message = "任务编号不能为空")
+ private String id;
+
+ @Schema(description = "抄送的用户编号数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1,2]")
+ @NotEmpty(message = "抄送用户不能为空")
+ private Collection copyUserIds;
+
+ @Schema(description = "抄送意见", example = "帮忙看看！")
+ private String reason;
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
index 7f5177b948..5b34d36db9 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -33,14 +34,21 @@ public class BpmTaskRespVO {
@Schema(description = "审批理由", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
private String reason;
+ @Schema(description = "任务负责人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048")
+ @JsonIgnore // 不返回，只是方便后续读取，赋值给 ownerUser
+ private Long owner;
/**
* 负责人的用户信息
*/
- private BpmProcessInstanceRespVO.User ownerUser;
+ private UserSimpleBaseVO ownerUser;
+
+ @Schema(description = "任务分配人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048")
+ @JsonIgnore // 不返回，只是方便后续读取，赋值给 assigneeUser
+ private Long assignee;
/**
* 审核的用户信息
*/
- private BpmProcessInstanceRespVO.User assigneeUser;
+ private UserSimpleBaseVO assigneeUser;
@Schema(description = "任务定义的标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "Activity_one")
private String taskDefinitionKey;
@@ -55,18 +63,20 @@ public class BpmTaskRespVO {
@Schema(description = "父任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String parentTaskId;
@Schema(description = "子任务列表（由加签生成）", requiredMode = Schema.RequiredMode.REQUIRED, example = "childrenTask")
- private List children;
+ private List children; // 由加签生成，包含多层子任务
@Schema(description = "表单编号", example = "1024")
private Long formId;
@Schema(description = "表单名字", example = "请假表单")
private String formName;
- @Schema(description = "表单的配置-JSON 字符串")
+ @Schema(description = "表单的配置，JSON 字符串")
private String formConf;
@Schema(description = "表单项的数组")
private List formFields;
@Schema(description = "提交的表单值", requiredMode = Schema.RequiredMode.REQUIRED)
private Map formVariables;
+ @Schema(description = "操作按钮设置值")
+ private Map buttonsSetting;
@Data
@Schema(description = "流程实例")
@@ -87,8 +97,19 @@ public class BpmTaskRespVO {
/**
* 发起人的用户信息
*/
- private BpmProcessInstanceRespVO.User startUser;
+ private UserSimpleBaseVO startUser;
+
+ }
+
+ @Data
+ @Schema(description = "操作按钮设置")
+ public static class OperationButtonSetting {
+
+ @Schema(description = "显示名称", example = "审批")
+ private String displayName;
+ @Schema(description = "是否启用", example = "true")
+ private Boolean enable;
}
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskReturnReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskReturnReqVO.java
index 49a2316ca1..b4df48a870 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskReturnReqVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskReturnReqVO.java
@@ -5,7 +5,7 @@ import lombok.Data;
import javax.validation.constraints.NotEmpty;
-@Schema(description = "管理后台 - 回退流程任务的 Request VO")
+@Schema(description = "管理后台 - 退回流程任务的 Request VO")
@Data
public class BpmTaskReturnReqVO {
@@ -13,12 +13,12 @@ public class BpmTaskReturnReqVO {
@NotEmpty(message = "任务编号不能为空")
private String id;
- @Schema(description = "回退到的任务 Key", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotEmpty(message = "回退到的任务 Key 不能为空")
+ @Schema(description = "退回到的任务 Key", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotEmpty(message = "退回到的任务 Key 不能为空")
private String targetTaskDefinitionKey;
- @Schema(description = "回退意见", requiredMode = Schema.RequiredMode.REQUIRED, example = "我就是想驳回")
- @NotEmpty(message = "回退意见不能为空")
+ @Schema(description = "退回意见", requiredMode = Schema.RequiredMode.REQUIRED, example = "我就是想驳回")
+ @NotEmpty(message = "退回意见不能为空")
private String reason;
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
index 3fe5cc068e..64701ef1fa 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
@@ -1,19 +1,18 @@
package cn.iocoder.yudao.module.bpm.convert.definition;
import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.date.DateUtils;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelCreateReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelUpdateReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelSaveReqVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
-import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import org.flowable.common.engine.impl.db.SuspensionState;
import org.flowable.engine.repository.Deployment;
import org.flowable.engine.repository.Model;
@@ -21,9 +20,12 @@ import org.flowable.engine.repository.ProcessDefinition;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
/**
* 流程模型 Convert
@@ -35,46 +37,47 @@ public interface BpmModelConvert {
BpmModelConvert INSTANCE = Mappers.getMapper(BpmModelConvert.class);
- default PageResult buildModelPage(PageResult pageResult,
- Map formMap,
- Map categoryMap, Map deploymentMap,
- Map processDefinitionMap) {
- List list = CollectionUtils.convertList(pageResult.getList(), model -> {
- BpmModelMetaInfoRespDTO metaInfo = buildMetaInfo(model);
+ default List buildModelList(List list,
+ Map formMap,
+ Map categoryMap,
+ Map deploymentMap,
+ Map processDefinitionMap,
+ Map userMap) {
+ List result = convertList(list, model -> {
+ BpmModelMetaInfoVO metaInfo = parseMetaInfo(model);
BpmFormDO form = metaInfo != null ? formMap.get(metaInfo.getFormId()) : null;
BpmCategoryDO category = categoryMap.get(model.getCategory());
Deployment deployment = model.getDeploymentId() != null ? deploymentMap.get(model.getDeploymentId()) : null;
- ProcessDefinition processDefinition = model.getDeploymentId() != null ? processDefinitionMap.get(model.getDeploymentId()) : null;
- return buildModel0(model, metaInfo, form, category, deployment, processDefinition);
+ ProcessDefinition processDefinition = model.getDeploymentId() != null ?
+ processDefinitionMap.get(model.getDeploymentId()) : null;
+ List startUsers = metaInfo != null ? convertList(metaInfo.getStartUserIds(), userMap::get) : null;
+ return buildModel0(model, metaInfo, form, category, deployment, processDefinition, startUsers);
});
- return new PageResult<>(list, pageResult.getTotal());
+ // 排序
+ result.sort(Comparator.comparing(BpmModelMetaInfoVO::getSort));
+ return result;
}
- default BpmModelRespVO buildModel(Model model,
- byte[] bpmnBytes) {
- BpmModelMetaInfoRespDTO metaInfo = buildMetaInfo(model);
- BpmModelRespVO modelVO = buildModel0(model, metaInfo, null, null, null, null);
+ default BpmModelRespVO buildModel(Model model, byte[] bpmnBytes) {
+ BpmModelMetaInfoVO metaInfo = parseMetaInfo(model);
+ BpmModelRespVO modelVO = buildModel0(model, metaInfo, null, null, null, null, null);
if (ArrayUtil.isNotEmpty(bpmnBytes)) {
- modelVO.setBpmnXml(new String(bpmnBytes));
+ modelVO.setBpmnXml(BpmnModelUtils.getBpmnXml(bpmnBytes));
}
return modelVO;
}
default BpmModelRespVO buildModel0(Model model,
- BpmModelMetaInfoRespDTO metaInfo, BpmFormDO form, BpmCategoryDO category,
- Deployment deployment, ProcessDefinition processDefinition) {
+ BpmModelMetaInfoVO metaInfo, BpmFormDO form, BpmCategoryDO category,
+ Deployment deployment, ProcessDefinition processDefinition,
+ List startUsers) {
BpmModelRespVO modelRespVO = new BpmModelRespVO().setId(model.getId()).setName(model.getName())
.setKey(model.getKey()).setCategory(model.getCategory())
.setCreateTime(DateUtils.of(model.getCreateTime()));
// Form
- if (metaInfo != null) {
- modelRespVO.setFormType(metaInfo.getFormType()).setFormId(metaInfo.getFormId())
- .setFormCustomCreatePath(metaInfo.getFormCustomCreatePath())
- .setFormCustomViewPath(metaInfo.getFormCustomViewPath());
- modelRespVO.setIcon(metaInfo.getIcon()).setDescription(metaInfo.getDescription());
- }
+ BeanUtils.copyProperties(metaInfo, modelRespVO);
if (form != null) {
- modelRespVO.setFormId(form.getId()).setFormName(form.getName());
+ modelRespVO.setFormName(form.getName());
}
// Category
if (category != null) {
@@ -89,49 +92,34 @@ public interface BpmModelConvert {
modelRespVO.getProcessDefinition().setDeploymentTime(DateUtils.of(deployment.getDeploymentTime()));
}
}
+ // User
+ modelRespVO.setStartUsers(BeanUtils.toBean(startUsers, UserSimpleBaseVO.class));
return modelRespVO;
}
- default void copyToCreateModel(Model model, BpmModelCreateReqVO bean) {
- model.setName(bean.getName());
- model.setKey(bean.getKey());
- model.setMetaInfo(buildMetaInfoStr(null,
- null, bean.getDescription(),
- null, null, null, null));
- }
-
- default void copyToUpdateModel(Model model, BpmModelUpdateReqVO bean) {
- model.setName(bean.getName());
- model.setCategory(bean.getCategory());
- model.setMetaInfo(buildMetaInfoStr(buildMetaInfo(model),
- bean.getIcon(), bean.getDescription(),
- bean.getFormType(), bean.getFormId(), bean.getFormCustomCreatePath(), bean.getFormCustomViewPath()));
+ default void copyToModel(Model model, BpmModelSaveReqVO reqVO) {
+ model.setName(reqVO.getName());
+ model.setKey(reqVO.getKey());
+ model.setCategory(reqVO.getCategory());
+ model.setMetaInfo(JsonUtils.toJsonString(BeanUtils.toBean(reqVO, BpmModelMetaInfoVO.class)));
}
- default String buildMetaInfoStr(BpmModelMetaInfoRespDTO metaInfo,
- String icon, String description,
- Integer formType, Long formId, String formCustomCreatePath, String formCustomViewPath) {
- if (metaInfo == null) {
- metaInfo = new BpmModelMetaInfoRespDTO();
+ default BpmModelMetaInfoVO parseMetaInfo(Model model) {
+ BpmModelMetaInfoVO vo = JsonUtils.parseObject(model.getMetaInfo(), BpmModelMetaInfoVO.class);
+ if (vo == null) {
+ return null;
}
- // 只有非空，才进行设置，避免更新时的覆盖
- if (StrUtil.isNotEmpty(icon)) {
- metaInfo.setIcon(icon);
+ if (vo.getManagerUserIds() == null) {
+ vo.setManagerUserIds(Collections.emptyList());
}
- if (StrUtil.isNotEmpty(description)) {
- metaInfo.setDescription(description);
+ if (vo.getStartUserIds() == null) {
+ vo.setStartUserIds(Collections.emptyList());
}
- if (Objects.nonNull(formType)) {
- metaInfo.setFormType(formType);
- metaInfo.setFormId(formId);
- metaInfo.setFormCustomCreatePath(formCustomCreatePath);
- metaInfo.setFormCustomViewPath(formCustomViewPath);
+ // 如果为空，兜底处理，使用 createTime 创建时间
+ if (vo.getSort() == null) {
+ vo.setSort(model.getCreateTime().getTime());
}
- return JsonUtils.toJsonString(metaInfo);
- }
-
- default BpmModelMetaInfoRespDTO buildMetaInfo(Model model) {
- return JsonUtils.parseObject(model.getMetaInfo(), BpmModelMetaInfoRespDTO.class);
+ return vo;
}
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmProcessDefinitionConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmProcessDefinitionConvert.java
index 0e767d787c..1ef8b6f058 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmProcessDefinitionConvert.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmProcessDefinitionConvert.java
@@ -11,7 +11,6 @@ import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
import org.flowable.bpmn.model.BpmnModel;
-import org.flowable.bpmn.model.UserTask;
import org.flowable.common.engine.impl.db.SuspensionState;
import org.flowable.engine.repository.Deployment;
import org.flowable.engine.repository.ProcessDefinition;
@@ -20,6 +19,7 @@ import org.mapstruct.Mapping;
import org.mapstruct.MappingTarget;
import org.mapstruct.factory.Mappers;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
@@ -47,7 +47,7 @@ public interface BpmProcessDefinitionConvert {
Map processDefinitionInfoMap,
Map formMap,
Map categoryMap) {
- return CollectionUtils.convertList(list, definition -> {
+ List result = CollectionUtils.convertList(list, definition -> {
Deployment deployment = MapUtil.get(deploymentMap, definition.getDeploymentId(), Deployment.class);
BpmProcessDefinitionInfoDO processDefinitionInfo = MapUtil.get(processDefinitionInfoMap, definition.getId(), BpmProcessDefinitionInfoDO.class);
BpmFormDO form = null;
@@ -55,8 +55,11 @@ public interface BpmProcessDefinitionConvert {
form = MapUtil.get(formMap, processDefinitionInfo.getFormId(), BpmFormDO.class);
}
BpmCategoryDO category = MapUtil.get(categoryMap, definition.getCategory(), BpmCategoryDO.class);
- return buildProcessDefinition(definition, deployment, processDefinitionInfo, form, category, null, null);
+ return buildProcessDefinition(definition, deployment, processDefinitionInfo, form, category, null);
});
+ // 排序
+ result.sort(Comparator.comparing(BpmProcessDefinitionRespVO::getSort));
+ return result;
}
default BpmProcessDefinitionRespVO buildProcessDefinition(ProcessDefinition definition,
@@ -64,8 +67,7 @@ public interface BpmProcessDefinitionConvert {
BpmProcessDefinitionInfoDO processDefinitionInfo,
BpmFormDO form,
BpmCategoryDO category,
- BpmnModel bpmnModel,
- List startUserSelectUserTaskList) {
+ BpmnModel bpmnModel) {
BpmProcessDefinitionRespVO respVO = BeanUtils.toBean(definition, BpmProcessDefinitionRespVO.class);
respVO.setSuspensionState(definition.isSuspended() ? SuspensionState.SUSPENDED.getStateCode() : SuspensionState.ACTIVE.getStateCode());
// Deployment
@@ -87,7 +89,6 @@ public interface BpmProcessDefinitionConvert {
// BpmnModel
if (bpmnModel != null) {
respVO.setBpmnXml(BpmnModelUtils.getBpmnXml(bpmnModel));
- respVO.setStartUserSelectTasks(BeanUtils.toBean(startUserSelectUserTaskList, BpmProcessDefinitionRespVO.UserTask.class));
}
return respVO;
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
index 7981b9ddf0..450699c2f7 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
@@ -1,30 +1,47 @@
package cn.iocoder.yudao.module.bpm.convert.task;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceBpmnModelViewRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
+import cn.iocoder.yudao.module.bpm.convert.definition.BpmProcessDefinitionConvert;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO;
import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import org.flowable.bpmn.model.BpmnModel;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
+import org.flowable.task.api.history.HistoricTaskInstance;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.MappingTarget;
import org.mapstruct.factory.Mappers;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
/**
* 流程实例 Convert
@@ -47,14 +64,15 @@ public interface BpmProcessInstanceConvert {
BpmProcessInstanceRespVO respVO = vpPageResult.getList().get(i);
respVO.setStatus(FlowableUtils.getProcessInstanceStatus(pageResult.getList().get(i)));
MapUtils.findAndThen(processDefinitionMap, respVO.getProcessDefinitionId(),
- processDefinition -> respVO.setCategory(processDefinition.getCategory()));
+ processDefinition -> respVO.setCategory(processDefinition.getCategory())
+ .setProcessDefinition(BeanUtils.toBean(processDefinition, BpmProcessDefinitionRespVO.class)));
MapUtils.findAndThen(categoryMap, respVO.getCategory(), category -> respVO.setCategoryName(category.getName()));
respVO.setTasks(BeanUtils.toBean(taskMap.get(respVO.getId()), BpmProcessInstanceRespVO.Task.class));
// user
if (userMap != null) {
AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(pageResult.getList().get(i).getStartUserId()));
if (startUser != null) {
- respVO.setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class));
+ respVO.setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
MapUtils.findAndThen(deptMap, startUser.getDeptId(), dept -> respVO.getStartUser().setDeptName(dept.getName()));
}
}
@@ -64,20 +82,18 @@ public interface BpmProcessInstanceConvert {
default BpmProcessInstanceRespVO buildProcessInstance(HistoricProcessInstance processInstance,
ProcessDefinition processDefinition,
- BpmProcessDefinitionInfoDO processDefinitionExt,
- String bpmnXml,
+ BpmProcessDefinitionInfoDO processDefinitionInfo,
AdminUserRespDTO startUser,
DeptRespDTO dept) {
BpmProcessInstanceRespVO respVO = BeanUtils.toBean(processInstance, BpmProcessInstanceRespVO.class);
- respVO.setStatus(FlowableUtils.getProcessInstanceStatus(processInstance));
- respVO.setFormVariables(FlowableUtils.getProcessInstanceFormVariable(processInstance));
+ respVO.setStatus(FlowableUtils.getProcessInstanceStatus(processInstance))
+ .setFormVariables(FlowableUtils.getProcessInstanceFormVariable(processInstance));
// definition
respVO.setProcessDefinition(BeanUtils.toBean(processDefinition, BpmProcessDefinitionRespVO.class));
- copyTo(processDefinitionExt, respVO.getProcessDefinition());
- respVO.getProcessDefinition().setBpmnXml(bpmnXml);
+ copyTo(processDefinitionInfo, respVO.getProcessDefinition());
// user
if (startUser != null) {
- respVO.setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class));
+ respVO.setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
if (dept != null) {
respVO.getStartUser().setDeptName(dept.getName());
}
@@ -88,12 +104,7 @@ public interface BpmProcessInstanceConvert {
@Mapping(source = "from.id", target = "to.id", ignore = true)
void copyTo(BpmProcessDefinitionInfoDO from, @MappingTarget BpmProcessDefinitionRespVO to);
- default BpmProcessInstanceStatusEvent buildProcessInstanceStatusEvent(Object source, HistoricProcessInstance instance, Integer status) {
- return new BpmProcessInstanceStatusEvent(source).setId(instance.getId()).setStatus(status)
- .setProcessDefinitionKey(instance.getProcessDefinitionKey()).setBusinessKey(instance.getBusinessKey());
- }
-
- default BpmProcessInstanceStatusEvent buildProcessInstanceStatusEvent(Object source, ProcessInstance instance, Integer status) {;
+ default BpmProcessInstanceStatusEvent buildProcessInstanceStatusEvent(Object source, ProcessInstance instance, Integer status) {
return new BpmProcessInstanceStatusEvent(source).setId(instance.getId()).setStatus(status)
.setProcessDefinitionKey(instance.getProcessDefinitionKey()).setBusinessKey(instance.getBusinessKey());
}
@@ -113,4 +124,156 @@ public interface BpmProcessInstanceConvert {
.setStartUserId(NumberUtils.parseLong(instance.getStartUserId()));
}
+ default BpmProcessInstanceBpmnModelViewRespVO buildProcessInstanceBpmnModelView(HistoricProcessInstance processInstance,
+ List taskInstances,
+ BpmnModel bpmnModel,
+ BpmSimpleModelNodeVO simpleModel,
+ Set unfinishedTaskActivityIds,
+ Set finishedTaskActivityIds,
+ Set finishedSequenceFlowActivityIds,
+ Set rejectTaskActivityIds,
+ Map userMap,
+ Map deptMap) {
+ BpmProcessInstanceBpmnModelViewRespVO respVO = new BpmProcessInstanceBpmnModelViewRespVO();
+ // 基本信息
+ respVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmProcessInstanceRespVO.class, o -> o
+ .setStatus(FlowableUtils.getProcessInstanceStatus(processInstance)))
+ .setStartUser(buildUser(processInstance.getStartUserId(), userMap, deptMap)));
+ respVO.setTasks(convertList(taskInstances, task -> BeanUtils.toBean(task, BpmTaskRespVO.class)
+ .setStatus(FlowableUtils.getTaskStatus(task)).setReason(FlowableUtils.getTaskReason(task))
+ .setAssigneeUser(buildUser(task.getAssignee(), userMap, deptMap))
+ .setOwnerUser(buildUser(task.getOwner(), userMap, deptMap))));
+ respVO.setBpmnXml(BpmnModelUtils.getBpmnXml(bpmnModel));
+ respVO.setSimpleModel(simpleModel);
+ // 进度信息
+ respVO.setUnfinishedTaskActivityIds(unfinishedTaskActivityIds)
+ .setFinishedTaskActivityIds(finishedTaskActivityIds)
+ .setFinishedSequenceFlowActivityIds(finishedSequenceFlowActivityIds)
+ .setRejectedTaskActivityIds(rejectTaskActivityIds);
+ return respVO;
+ }
+
+ default UserSimpleBaseVO buildUser(String userIdStr,
+ Map userMap,
+ Map deptMap) {
+ if (StrUtil.isEmpty(userIdStr)) {
+ return null;
+ }
+ Long userId = NumberUtils.parseLong(userIdStr);
+ return buildUser(userId, userMap, deptMap);
+ }
+
+ default UserSimpleBaseVO buildUser(Long userId,
+ Map userMap,
+ Map deptMap) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = userMap.get(userId);
+ if (user == null) {
+ return null;
+ }
+ UserSimpleBaseVO userVO = BeanUtils.toBean(user, UserSimpleBaseVO.class);
+ DeptRespDTO dept = user.getDeptId() != null ? deptMap.get(user.getDeptId()) : null;
+ if (dept != null) {
+ userVO.setDeptName(dept.getName());
+ }
+ return userVO;
+ }
+
+ default BpmApprovalDetailRespVO.ActivityNodeTask buildApprovalTaskInfo(HistoricTaskInstance task) {
+ if (task == null) {
+ return null;
+ }
+ return BeanUtils.toBean(task, BpmApprovalDetailRespVO.ActivityNodeTask.class)
+ .setStatus(FlowableUtils.getTaskStatus(task)).setReason(FlowableUtils.getTaskReason(task));
+ }
+
+ default Set parseUserIds(HistoricProcessInstance processInstance,
+ List activityNodes,
+ BpmTaskRespVO todoTask) {
+ Set userIds = new HashSet<>();
+ if (processInstance != null) {
+ userIds.add(NumberUtils.parseLong(processInstance.getStartUserId()));
+ }
+ for (BpmApprovalDetailRespVO.ActivityNode activityNode : activityNodes) {
+ CollUtil.addAll(userIds, convertSet(activityNode.getTasks(), BpmApprovalDetailRespVO.ActivityNodeTask::getAssignee));
+ CollUtil.addAll(userIds, convertSet(activityNode.getTasks(), BpmApprovalDetailRespVO.ActivityNodeTask::getOwner));
+ CollUtil.addAll(userIds, activityNode.getCandidateUserIds());
+ }
+ if (todoTask != null) {
+ CollUtil.addIfAbsent(userIds, todoTask.getAssignee());
+ CollUtil.addIfAbsent(userIds, todoTask.getOwner());
+ if (CollUtil.isNotEmpty(todoTask.getChildren())) {
+ CollUtil.addAll(userIds, convertSet(todoTask.getChildren(), BpmTaskRespVO::getAssignee));
+ CollUtil.addAll(userIds, convertSet(todoTask.getChildren(), BpmTaskRespVO::getOwner));
+ }
+ }
+ return userIds;
+ }
+
+ default Set parseUserIds02(HistoricProcessInstance processInstance,
+ List tasks) {
+ Set userIds = SetUtils.asSet(Long.valueOf(processInstance.getStartUserId()));
+ tasks.forEach(task -> {
+ CollUtil.addIfAbsent(userIds, NumberUtils.parseLong((task.getAssignee())));
+ CollUtil.addIfAbsent(userIds, NumberUtils.parseLong((task.getOwner())));
+ });
+ return userIds;
+ }
+
+ default BpmApprovalDetailRespVO buildApprovalDetail(BpmnModel bpmnModel,
+ ProcessDefinition processDefinition,
+ BpmProcessDefinitionInfoDO processDefinitionInfo,
+ HistoricProcessInstance processInstance,
+ Integer processInstanceStatus,
+ List activityNodes,
+ BpmTaskRespVO todoTask,
+ Map formFieldsPermission,
+ Map userMap,
+ Map deptMap) {
+ // 1.1 流程实例
+ BpmProcessInstanceRespVO processInstanceResp = null;
+ if (processInstance != null) {
+ AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId()));
+ DeptRespDTO dept = startUser != null ? deptMap.get(startUser.getDeptId()) : null;
+ processInstanceResp = buildProcessInstance(processInstance, null, null, startUser, dept);
+ }
+
+ // 1.2 流程定义
+ BpmProcessDefinitionRespVO definitionResp = BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinition(
+ processDefinition, null, processDefinitionInfo, null, null, bpmnModel);
+
+ // 1.3 流程节点
+ activityNodes.forEach(approveNode -> {
+ if (approveNode.getTasks() != null) {
+ approveNode.getTasks().forEach(task -> {
+ task.setAssigneeUser(buildUser(task.getAssignee(), userMap, deptMap));
+ task.setOwnerUser(buildUser(task.getOwner(), userMap, deptMap));
+ });
+ }
+ approveNode.setCandidateUsers(convertList(approveNode.getCandidateUserIds(), userId -> buildUser(userId, userMap, deptMap)));
+ });
+
+ // 1.4 待办任务
+ if (todoTask != null) {
+ todoTask.setAssigneeUser(buildUser(todoTask.getAssignee(), userMap, deptMap));
+ todoTask.setOwnerUser(buildUser(todoTask.getOwner(), userMap, deptMap));
+ if (CollUtil.isNotEmpty(todoTask.getChildren())) {
+ todoTask.getChildren().forEach(childTask -> {
+ childTask.setAssigneeUser(buildUser(childTask.getAssignee(), userMap, deptMap));
+ childTask.setOwnerUser(buildUser(childTask.getOwner(), userMap, deptMap));
+ });
+ }
+ }
+
+ // 2. 拼接起来
+ return new BpmApprovalDetailRespVO().setStatus(processInstanceStatus)
+ .setProcessDefinition(definitionResp)
+ .setProcessInstance(processInstanceResp)
+ .setFormFieldsPermission(formFieldsPermission)
+ .setTodoTask(todoTask)
+ .setActivityNodes(activityNodes);
+ }
+
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
index 5f4e915d3f..b44c91951e 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
@@ -1,14 +1,15 @@
package cn.iocoder.yudao.module.bpm.convert.task;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
@@ -25,7 +26,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
/**
@@ -48,7 +49,7 @@ public interface BpmTaskConvert {
}
taskVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmTaskRespVO.ProcessInstance.class));
AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId()));
- taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class));
+ taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
});
}
@@ -62,7 +63,7 @@ public interface BpmTaskConvert {
// 用户信息
AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(task.getAssignee()));
if (assignUser != null) {
- taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, BpmProcessInstanceRespVO.User.class));
+ taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, UserSimpleBaseVO.class));
findAndThen(deptMap, assignUser.getDeptId(), dept -> taskVO.getAssigneeUser().setDeptName(dept.getName()));
}
// 流程实例
@@ -70,7 +71,7 @@ public interface BpmTaskConvert {
if (processInstance != null) {
AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId()));
taskVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmTaskRespVO.ProcessInstance.class));
- taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class));
+ taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
}
return taskVO;
});
@@ -78,17 +79,17 @@ public interface BpmTaskConvert {
}
default List buildTaskListByProcessInstanceId(List taskList,
- HistoricProcessInstance processInstance,
Map formMap,
Map userMap,
Map deptMap) {
- List taskVOList = CollectionUtils.convertList(taskList, task -> {
+ return CollectionUtils.convertList(taskList, task -> {
+ // 特殊：已取消的任务，不返回
BpmTaskRespVO taskVO = BeanUtils.toBean(task, BpmTaskRespVO.class);
- taskVO.setStatus(FlowableUtils.getTaskStatus(task)).setReason(FlowableUtils.getTaskReason(task));
- // 流程实例
- AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId()));
- taskVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmTaskRespVO.ProcessInstance.class));
- taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class));
+ Integer taskStatus = FlowableUtils.getTaskStatus(task);
+ if (BpmTaskStatusEnum.isCancelStatus(taskStatus)) {
+ return null;
+ }
+ taskVO.setStatus(taskStatus).setReason(FlowableUtils.getTaskReason(task));
// 表单信息
BpmFormDO form = MapUtil.get(formMap, NumberUtils.parseLong(task.getFormKey()), BpmFormDO.class);
if (form != null) {
@@ -96,27 +97,10 @@ public interface BpmTaskConvert {
.setFormFields(form.getFields()).setFormVariables(FlowableUtils.getTaskFormVariable(task));
}
// 用户信息
- AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(task.getAssignee()));
- if (assignUser != null) {
- taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, BpmProcessInstanceRespVO.User.class));
- findAndThen(deptMap, assignUser.getDeptId(), dept -> taskVO.getAssigneeUser().setDeptName(dept.getName()));
- }
- AdminUserRespDTO ownerUser = userMap.get(NumberUtils.parseLong(task.getOwner()));
- if (ownerUser != null) {
- taskVO.setOwnerUser(BeanUtils.toBean(ownerUser, BpmProcessInstanceRespVO.User.class));
- findAndThen(deptMap, ownerUser.getDeptId(), dept -> taskVO.getOwnerUser().setDeptName(dept.getName()));
- }
+ buildTaskAssignee(taskVO, task.getAssignee(), userMap, deptMap);
+ buildTaskOwner(taskVO, task.getOwner(), userMap, deptMap);
return taskVO;
});
-
- // 拼接父子关系
- Map> childrenTaskMap = convertMultiMap(
- filterList(taskVOList, r -> StrUtil.isNotEmpty(r.getParentTaskId())),
- BpmTaskRespVO::getParentTaskId);
- for (BpmTaskRespVO taskVO : taskVOList) {
- taskVO.setChildren(childrenTaskMap.get(taskVO.getId()));
- }
- return filterList(taskVOList, r -> StrUtil.isEmpty(r.getParentTaskId()));
}
default List buildTaskListByParentTaskId(List taskList,
@@ -125,7 +109,7 @@ public interface BpmTaskConvert {
return convertList(taskList, task -> BeanUtils.toBean(task, BpmTaskRespVO.class, taskVO -> {
AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(task.getAssignee()));
if (assignUser != null) {
- taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, BpmProcessInstanceRespVO.User.class));
+ taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, UserSimpleBaseVO.class));
DeptRespDTO dept = deptMap.get(assignUser.getDeptId());
if (dept != null) {
taskVO.getAssigneeUser().setDeptName(dept.getName());
@@ -133,12 +117,21 @@ public interface BpmTaskConvert {
}
AdminUserRespDTO ownerUser = userMap.get(NumberUtils.parseLong(task.getOwner()));
if (ownerUser != null) {
- taskVO.setOwnerUser(BeanUtils.toBean(ownerUser, BpmProcessInstanceRespVO.User.class));
+ taskVO.setOwnerUser(BeanUtils.toBean(ownerUser, UserSimpleBaseVO.class));
findAndThen(deptMap, ownerUser.getDeptId(), dept -> taskVO.getOwnerUser().setDeptName(dept.getName()));
}
}));
}
+ default BpmTaskRespVO buildTodoTask(Task todoTask, List childrenTasks,
+ Map buttonsSetting) {
+ return BeanUtils.toBean(todoTask, BpmTaskRespVO.class)
+ .setStatus(FlowableUtils.getTaskStatus(todoTask)).setReason(FlowableUtils.getTaskReason(todoTask))
+ .setButtonsSetting(buttonsSetting)
+ .setChildren(convertList(childrenTasks, childTask -> BeanUtils.toBean(childTask, BpmTaskRespVO.class)
+ .setStatus(FlowableUtils.getTaskStatus(childTask))));
+ }
+
default BpmMessageSendWhenTaskCreatedReqDTO convert(ProcessInstance processInstance, AdminUserRespDTO startUser,
Task task) {
BpmMessageSendWhenTaskCreatedReqDTO reqDTO = new BpmMessageSendWhenTaskCreatedReqDTO();
@@ -149,14 +142,50 @@ public interface BpmTaskConvert {
return reqDTO;
}
+ default void buildTaskOwner(BpmTaskRespVO task, String taskOwner,
+ Map userMap,
+ Map deptMap) {
+ AdminUserRespDTO ownerUser = userMap.get(NumberUtils.parseLong(taskOwner));
+ if (ownerUser != null) {
+ task.setOwnerUser(BeanUtils.toBean(ownerUser, UserSimpleBaseVO.class));
+ findAndThen(deptMap, ownerUser.getDeptId(), dept -> task.getOwnerUser().setDeptName(dept.getName()));
+ }
+ }
+
+ default void buildTaskChildren(BpmTaskRespVO task, Map> childrenTaskMap,
+ Map userMap, Map deptMap) {
+ List childTasks = childrenTaskMap.get(task.getId());
+ if (CollUtil.isNotEmpty(childTasks)) {
+ task.setChildren(
+ convertList(childTasks, childTask -> {
+ BpmTaskRespVO childTaskVO = BeanUtils.toBean(childTask, BpmTaskRespVO.class);
+ childTaskVO.setStatus(FlowableUtils.getTaskStatus(childTask));
+ buildTaskOwner(childTaskVO, childTask.getOwner(), userMap, deptMap);
+ buildTaskAssignee(childTaskVO, childTask.getAssignee(), userMap, deptMap);
+ return childTaskVO;
+ })
+ );
+ }
+ }
+
+ default void buildTaskAssignee(BpmTaskRespVO task, String taskAssignee,
+ Map userMap,
+ Map deptMap) {
+ AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(taskAssignee));
+ if (assignUser != null) {
+ task.setAssigneeUser(BeanUtils.toBean(assignUser, UserSimpleBaseVO.class));
+ findAndThen(deptMap, assignUser.getDeptId(), dept -> task.getAssigneeUser().setDeptName(dept.getName()));
+ }
+ }
+
/**
* 将父任务的属性，拷贝到子任务（加签任务）
- *
+ *
* 为什么不使用 mapstruct 映射？因为 TaskEntityImpl 还有很多其他属性，这里我们只设置我们需要的。
* 使用 mapstruct 会将里面嵌套的各个属性值都设置进去，会出现意想不到的问题。
*
* @param parentTask 父任务
- * @param childTask 加签任务
+ * @param childTask 加签任务
*/
default void copyTo(TaskEntityImpl parentTask, TaskEntityImpl childTask) {
childTask.setName(parentTask.getName());
@@ -165,7 +194,6 @@ public interface BpmTaskConvert {
childTask.setParentTaskId(parentTask.getId());
childTask.setProcessDefinitionId(parentTask.getProcessDefinitionId());
childTask.setProcessInstanceId(parentTask.getProcessInstanceId());
-// childTask.setExecutionId(parentTask.getExecutionId()); // TODO 芋艿：新加的，不太确定；尴尬，不加时，子任务不通过会失败（报错）；加了，子任务审批通过会失败（报错）
childTask.setTaskDefinitionKey(parentTask.getTaskDefinitionKey());
childTask.setTaskDefinitionId(parentTask.getTaskDefinitionId());
childTask.setPriority(parentTask.getPriority());
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmCategoryDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmCategoryDO.java
index 916009d377..01c71ebac9 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmCategoryDO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmCategoryDO.java
@@ -4,7 +4,10 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* BPM 流程分类 DO
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmFormDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmFormDO.java
index 4c0218896d..21080cbb18 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmFormDO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmFormDO.java
@@ -1,11 +1,15 @@
package cn.iocoder.yudao.module.bpm.dal.dataobject.definition;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
import java.util.List;
@@ -16,6 +20,7 @@ import java.util.List;
* @author 芋道源码
*/
@TableName(value = "bpm_form", autoResultMap = true)
+@KeySequence("bpm_form_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@Builder
@NoArgsConstructor
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java
index 9ac9252d5b..7248b31cdb 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java
@@ -1,12 +1,22 @@
package cn.iocoder.yudao.module.bpm.dal.dataobject.definition;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler;
+import cn.iocoder.yudao.framework.mybatis.core.type.StringListTypeHandler;
import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum;
+import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelTypeEnum;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.flowable.engine.repository.Model;
+import org.flowable.engine.repository.ProcessDefinition;
import java.util.List;
@@ -17,6 +27,7 @@ import java.util.List;
* @author 芋道源码
*/
@TableName(value = "bpm_process_definition_info", autoResultMap = true)
+@KeySequence("bpm_process_definition_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@Builder
@NoArgsConstructor
@@ -31,15 +42,21 @@ public class BpmProcessDefinitionInfoDO extends BaseDO {
/**
* 流程定义的编号
*
- * 关联 ProcessDefinition 的 id 属性
+ * 关联 {@link ProcessDefinition#getId()} 属性
*/
private String processDefinitionId;
/**
* 流程模型的编号
*
- * 关联 Model 的 id 属性
+ * 关联 {@link Model#getId()} 属性
*/
private String modelId;
+ /**
+ * 流程模型的类型
+ *
+ * 枚举 {@link BpmModelTypeEnum}
+ */
+ private Integer modelType;
/**
* 图标
@@ -53,11 +70,12 @@ public class BpmProcessDefinitionInfoDO extends BaseDO {
/**
* 表单类型
*
- * 关联 {@link BpmModelFormTypeEnum}
+ * 枚举 {@link BpmModelFormTypeEnum}
*/
private Integer formType;
/**
* 动态表单编号
+ *
* 在表单类型为 {@link BpmModelFormTypeEnum#NORMAL} 时
*
* 关联 {@link BpmFormDO#getId()}
@@ -65,6 +83,7 @@ public class BpmProcessDefinitionInfoDO extends BaseDO {
private Long formId;
/**
* 表单的配置
+ *
* 在表单类型为 {@link BpmModelFormTypeEnum#NORMAL} 时
*
* 冗余 {@link BpmFormDO#getConf()}
@@ -72,21 +91,63 @@ public class BpmProcessDefinitionInfoDO extends BaseDO {
private String formConf;
/**
* 表单项的数组
+ *
* 在表单类型为 {@link BpmModelFormTypeEnum#NORMAL} 时
*
- * 冗余 {@link BpmFormDO#getFields()} ()}
+ * 冗余 {@link BpmFormDO#getFields()}
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private List formFields;
/**
* 自定义表单的提交路径，使用 Vue 的路由地址
+ *
* 在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时
*/
private String formCustomCreatePath;
/**
* 自定义表单的查看路径，使用 Vue 的路由地址
+ *
* 在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时
*/
private String formCustomViewPath;
+ /**
+ * SIMPLE 设计器模型数据 json 格式
+ *
+ * 目的：当使用仿钉钉设计器时。流程模型发布的时候，需要保存流程模型设计器的快照数据。
+ */
+ private String simpleModel;
+ /**
+ * 是否可见
+ *
+ * 目的：如果 false 不可见，则不展示在“发起流程”的列表里
+ */
+ private Boolean visible;
+ /**
+ * 排序值
+ */
+ private Long sort;
+
+ /**
+ * 可发起用户编号数组
+ *
+ * 关联 {@link AdminUserRespDTO#getId()} 字段的数组
+ *
+ * 如果为空，则表示“全部可以发起”！
+ *
+ * 它和 {@link #visible} 的区别在于：
+ * 1. {@link #visible} 只是决定是否可见。即使不可见，还是可以发起
+ * 2. startUserIds 决定某个用户是否可以发起。如果该用户不可发起，则他也是不可见的
+ */
+ @TableField(typeHandler = LongListTypeHandler.class) // 为了可以使用 find_in_set 进行过滤
+ private List startUserIds;
+
+ /**
+ * 可管理用户编号数组
+ *
+ * 关联 {@link AdminUserRespDTO#getId()} 字段的数组
+ */
+ @TableField(typeHandler = StringListTypeHandler.class) // 为了可以使用 find_in_set 进行过滤
+ private List managerUserIds;
+
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessExpressionDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessExpressionDO.java
index 6f6be586ec..18494b68de 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessExpressionDO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessExpressionDO.java
@@ -1,11 +1,10 @@
package cn.iocoder.yudao.module.bpm.dal.dataobject.definition;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
/**
* BPM 流程表达式 DO
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessListenerDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessListenerDO.java
index 56be88ff3c..08ecebe112 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessListenerDO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessListenerDO.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.bpm.dal.dataobject.definition;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
@@ -16,6 +17,7 @@ import lombok.NoArgsConstructor;
* @author 芋道源码
*/
@TableName(value = "bpm_process_listener")
+@KeySequence("bpm_process_listener_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@Builder
@NoArgsConstructor
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java
index 87df0472bf..7b9f480b56 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java
@@ -2,11 +2,15 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.definition;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler;
+import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
import java.util.Set;
@@ -16,6 +20,7 @@ import java.util.Set;
* @author 芋道源码
*/
@TableName(value = "bpm_user_group", autoResultMap = true)
+@KeySequence("bpm_user_group_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@Builder
@NoArgsConstructor
@@ -44,7 +49,7 @@ public class BpmUserGroupDO extends BaseDO {
/**
* 成员用户编号数组
*/
- @TableField(typeHandler = JsonLongSetTypeHandler.class)
+ @TableField(typeHandler = JacksonTypeHandler.class)
private Set userIds;
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java
index 6c5b648dac..e75c974738 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java
@@ -2,9 +2,13 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
+import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
@@ -17,6 +21,7 @@ import java.time.LocalDateTime;
* @author 芋道源码
*/
@TableName("bpm_oa_leave")
+@KeySequence("bpm_oa_leave_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@Builder
@NoArgsConstructor
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java
index 57e729605d..96939f83d2 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java
@@ -1,9 +1,15 @@
package cn.iocoder.yudao.module.bpm.dal.dataobject.task;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
+import org.flowable.bpmn.model.FlowNode;
+import org.flowable.task.api.history.HistoricTaskInstance;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* 流程抄送 DO
@@ -12,6 +18,7 @@ import lombok.*;
* @since 2024-01-22
*/
@TableName(value = "bpm_process_instance_copy", autoResultMap = true)
+@KeySequence("bpm_process_instance_copy_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@Builder
@NoArgsConstructor
@@ -48,19 +55,26 @@ public class BpmProcessInstanceCopyDO extends BaseDO {
* 冗余 ProcessInstance 的 category 字段
*/
private String category;
-
/**
- * 任务主键
+ * 流程活动的编号
+ *
*
- * 关联 Task 的 id 属性
+ * 冗余 {@link FlowNode#getId()}，对应 BPMN XML 节点编号
+ * 原因：用于查询抄送节点的表单字段权限。因为仿钉钉/飞书的抄送节点 (ServiceTask)，没有 taskId，只有 activityId
*/
- private String taskId;
+ private String activityId;
+ /**
+ * 流程活动的名字
+ *
+ * 冗余 {@link FlowNode#getName()}
+ */
+ private String activityName;
/**
- * 任务名称
+ * 流程活动的编号
*
- * 冗余 Task 的 name 属性
+ * 关联 {@link HistoricTaskInstance#getId()}
*/
- private String taskName;
+ private String taskId;
/**
* 用户编号（被抄送的用户编号）
@@ -69,4 +83,9 @@ public class BpmProcessInstanceCopyDO extends BaseDO {
*/
private Long userId;
+ /**
+ * 抄送意见
+ */
+ private String reason;
+
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionInfoMapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionInfoMapper.java
index 419d638f8e..6e2f2ea05e 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionInfoMapper.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionInfoMapper.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bpm.dal.mysql.definition;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import org.apache.ibatis.annotations.Mapper;
@@ -18,4 +19,9 @@ public interface BpmProcessDefinitionInfoMapper extends BaseMapperX().eq(BpmProcessDefinitionInfoDO::getModelId, modelId));
+ }
+
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceCopyMapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceCopyMapper.java
index c5ec50f659..8f23024e84 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceCopyMapper.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceCopyMapper.java
@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessI
import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceCopyDO;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
@Mapper
public interface BpmProcessInstanceCopyMapper extends BaseMapperX {
@@ -18,4 +20,9 @@ public interface BpmProcessInstanceCopyMapper extends BaseMapperX selectListByProcessInstanceIdAndActivityId(String processInstanceId, String activityId) {
+ return selectList(BpmProcessInstanceCopyDO::getProcessInstanceId, processInstanceId,
+ BpmProcessInstanceCopyDO::getActivityId, activityId);
+ }
+
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java
index 8e69fdc752..e79437b436 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCand
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.event.BpmProcessInstanceEventPublisher;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import org.flowable.common.engine.api.delegate.FlowableFunctionDelegate;
import org.flowable.common.engine.api.delegate.event.FlowableEventListener;
import org.flowable.spring.SpringProcessEngineConfiguration;
import org.flowable.spring.boot.EngineConfigurationConfigurer;
@@ -56,12 +57,15 @@ public class BpmFlowableConfiguration {
@Bean
public EngineConfigurationConfigurer bpmProcessEngineConfigurationConfigurer(
ObjectProvider listeners,
+ ObjectProvider customFlowableFunctionDelegates,
BpmActivityBehaviorFactory bpmActivityBehaviorFactory) {
return configuration -> {
// 注册监听器，例如说 BpmActivityEventListener
configuration.setEventListeners(ListUtil.toList(listeners.iterator()));
// 设置 ActivityBehaviorFactory 实现类，用于流程任务的审核人的自定义
configuration.setActivityBehaviorFactory(bpmActivityBehaviorFactory);
+ // 设置自定义的函数
+ configuration.setCustomFlowableFunctionDelegates(ListUtil.toList(customFlowableFunctionDelegates.stream().iterator()));
};
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
index 64ebb1aac8..d856a96d65 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
@@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior;
-import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
+import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
+import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
import lombok.Setter;
import org.flowable.bpmn.model.Activity;
import org.flowable.engine.delegate.DelegateExecution;
@@ -48,8 +50,18 @@ public class BpmParallelMultiInstanceBehavior extends ParallelMultiInstanceBehav
super.collectionElementVariable = FlowableUtils.formatExecutionCollectionElementVariable(execution.getCurrentActivityId());
// 第二步，获取任务的所有处理人
- Set assigneeUserIds = taskCandidateInvoker.calculateUsers(execution);
- execution.setVariable(super.collectionVariable, assigneeUserIds);
+ @SuppressWarnings("unchecked")
+ Set assigneeUserIds = (Set) execution.getVariable(super.collectionVariable, Set.class);
+ if (assigneeUserIds == null) {
+ assigneeUserIds = taskCandidateInvoker.calculateUsersByTask(execution);
+ execution.setVariable(super.collectionVariable, assigneeUserIds);
+ if (CollUtil.isEmpty(assigneeUserIds)) {
+ // 特殊：如果没有处理人的情况下，至少有一个 null 空元素，避免自动通过！
+ // 这样，保证在 BpmUserTaskActivityBehavior 至少创建出一个 Task 任务
+ // 用途：1）审批人为空时；2）审批类型为自动通过、自动拒绝时
+ assigneeUserIds = SetUtils.asSet((Long) null);
+ }
+ }
return assigneeUserIds.size();
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
index a214e26255..c433f59117 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
@@ -1,14 +1,15 @@
package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior;
-import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
import lombok.Setter;
import org.flowable.bpmn.model.Activity;
import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior;
import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior;
-import java.util.LinkedHashSet;
import java.util.Set;
/**
@@ -42,8 +43,18 @@ public class BpmSequentialMultiInstanceBehavior extends SequentialMultiInstanceB
super.collectionElementVariable = FlowableUtils.formatExecutionCollectionElementVariable(execution.getCurrentActivityId());
// 第二步，获取任务的所有处理人
- Set assigneeUserIds = new LinkedHashSet<>(taskCandidateInvoker.calculateUsers(execution)); // 保证有序！！！
- execution.setVariable(super.collectionVariable, assigneeUserIds);
+ @SuppressWarnings("unchecked")
+ Set assigneeUserIds = (Set) execution.getVariable(super.collectionVariable, Set.class);
+ if (assigneeUserIds == null) {
+ assigneeUserIds = taskCandidateInvoker.calculateUsersByTask(execution);
+ execution.setVariable(super.collectionVariable, assigneeUserIds);
+ if (CollUtil.isEmpty(assigneeUserIds)) {
+ // 特殊：如果没有处理人的情况下，至少有一个 null 空元素，避免自动通过！
+ // 这样，保证在 BpmUserTaskActivityBehavior 至少创建出一个 Task 任务
+ // 用途：1）审批人为空时；2）审批类型为自动通过、自动拒绝时
+ assigneeUserIds = SetUtils.asSet((Long) null);
+ }
+ }
return assigneeUserIds.size();
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java
index c494652731..cba5187b38 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java
@@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.RandomUtil;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker;
import lombok.Setter;
@@ -14,6 +13,7 @@ import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.flowable.engine.impl.util.TaskHelper;
import org.flowable.task.service.TaskService;
import org.flowable.task.service.impl.persistence.entity.TaskEntity;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Set;
@@ -36,14 +36,16 @@ public class BpmUserTaskActivityBehavior extends UserTaskActivityBehavior {
}
@Override
+ @Transactional(rollbackFor = Exception.class)
protected void handleAssignments(TaskService taskService, String assignee, String owner,
List candidateUsers, List candidateGroups, TaskEntity task, ExpressionManager expressionManager,
DelegateExecution execution, ProcessEngineConfigurationImpl processEngineConfiguration) {
// 第一步，获得任务的候选用户
Long assigneeUserId = calculateTaskCandidateUsers(execution);
- Assert.notNull(assigneeUserId, "任务处理人不能为空");
// 第二步，设置作为负责人
- TaskHelper.changeTaskAssignee(task, String.valueOf(assigneeUserId));
+ if (assigneeUserId != null) {
+ TaskHelper.changeTaskAssignee(task, String.valueOf(assigneeUserId));
+ }
}
private Long calculateTaskCandidateUsers(DelegateExecution execution) {
@@ -55,7 +57,10 @@ public class BpmUserTaskActivityBehavior extends UserTaskActivityBehavior {
// 情况二，如果非多实例的任务，则计算任务处理人
// 第一步，先计算可处理该任务的处理人们
- Set candidateUserIds = taskCandidateInvoker.calculateUsers(execution);
+ Set candidateUserIds = taskCandidateInvoker.calculateUsersByTask(execution);
+ if (CollUtil.isEmpty(candidateUserIds)) {
+ return null;
+ }
// 第二步，后随机选择一个任务的处理人
// 疑问：为什么一定要选择一个任务处理人？
// 解答：项目对 bpm 的任务是责任到人，所以每个任务有且仅有一个处理人。
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvoker.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvoker.java
index c0c7ca0d9d..30e675bf05 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvoker.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvoker.java
@@ -2,27 +2,31 @@ package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
+import cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskApproveTypeEnum;
+import cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskAssignStartUserHandlerTypeEnum;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
+import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.BpmnModel;
+import org.flowable.bpmn.model.FlowElement;
import org.flowable.bpmn.model.UserTask;
import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.runtime.ProcessInstance;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.MODEL_DEPLOY_FAIL_TASK_CANDIDATE_NOT_CONFIG;
-import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.TASK_CREATE_FAIL_NO_CANDIDATE_USER;
/**
* {@link BpmTaskCandidateStrategy} 的调用者，用于调用对应的策略，实现任务的候选人的计算
@@ -57,7 +61,14 @@ public class BpmTaskCandidateInvoker {
List userTaskList = BpmnModelUtils.getBpmnModelElements(bpmnModel, UserTask.class);
// 遍历所有的 UserTask，校验审批人配置
userTaskList.forEach(userTask -> {
- // 1. 非空校验
+ // 1.1 非人工审批，无需校验审批人配置
+ Integer approveType = BpmnModelUtils.parseApproveType(userTask);
+ if (ObjectUtils.equalsAny(approveType,
+ BpmUserTaskApproveTypeEnum.AUTO_APPROVE.getType(),
+ BpmUserTaskApproveTypeEnum.AUTO_REJECT.getType())) {
+ return;
+ }
+ // 1.2 非空校验
Integer strategy = BpmnModelUtils.parseCandidateStrategy(userTask);
String param = BpmnModelUtils.parseCandidateParam(userTask);
if (strategy == null) {
@@ -79,20 +90,66 @@ public class BpmTaskCandidateInvoker {
* @return 用户编号集合
*/
@DataPermission(enable = false) // 忽略数据权限，避免因为过滤，导致找不到候选人
- public Set calculateUsers(DelegateExecution execution) {
- Integer strategy = BpmnModelUtils.parseCandidateStrategy(execution.getCurrentFlowElement());
- String param = BpmnModelUtils.parseCandidateParam(execution.getCurrentFlowElement());
+ public Set calculateUsersByTask(DelegateExecution execution) {
+ // 审批类型非人工审核时，不进行计算候选人。原因是：后续会自动通过、不通过
+ FlowElement flowElement = execution.getCurrentFlowElement();
+ Integer approveType = BpmnModelUtils.parseApproveType(flowElement);
+ if (ObjectUtils.equalsAny(approveType,
+ BpmUserTaskApproveTypeEnum.AUTO_APPROVE.getType(),
+ BpmUserTaskApproveTypeEnum.AUTO_REJECT.getType())) {
+ return new HashSet<>();
+ }
+
// 1.1 计算任务的候选人
- Set userIds = getCandidateStrategy(strategy).calculateUsers(execution, param);
+ Integer strategy = BpmnModelUtils.parseCandidateStrategy(flowElement);
+ String param = BpmnModelUtils.parseCandidateParam(flowElement);
+ Set userIds = getCandidateStrategy(strategy).calculateUsersByTask(execution, param);
// 1.2 移除被禁用的用户
removeDisableUsers(userIds);
- // 2. 校验是否有候选人
+ // 2. 候选人为空时，根据“审批人为空”的配置补充
if (CollUtil.isEmpty(userIds)) {
- log.error("[calculateUsers][流程任务({}/{}/{}) 任务规则({}/{}) 找不到候选人]", execution.getId(),
- execution.getProcessDefinitionId(), execution.getCurrentActivityId(), strategy, param);
- throw exception(TASK_CREATE_FAIL_NO_CANDIDATE_USER);
+ userIds = getCandidateStrategy(BpmTaskCandidateStrategyEnum.ASSIGN_EMPTY.getStrategy())
+ .calculateUsersByTask(execution, param);
+ // ASSIGN_EMPTY 策略，不需要移除被禁用的用户。原因是，再移除，可能会出现更没审批人了！！！
}
+
+ // 3. 移除发起人的用户
+ ProcessInstance processInstance = SpringUtil.getBean(BpmProcessInstanceService.class)
+ .getProcessInstance(execution.getProcessInstanceId());
+ Assert.notNull(processInstance, "流程实例({}) 不存在", execution.getProcessInstanceId());
+ removeStartUserIfSkip(userIds, flowElement, Long.valueOf(processInstance.getStartUserId()));
+ return userIds;
+ }
+
+ public Set calculateUsersByActivity(BpmnModel bpmnModel, String activityId,
+ Long startUserId, String processDefinitionId, Map processVariables) {
+ // 审批类型非人工审核时，不进行计算候选人。原因是：后续会自动通过、不通过
+ FlowElement flowElement = BpmnModelUtils.getFlowElementById(bpmnModel, activityId);
+ Integer approveType = BpmnModelUtils.parseApproveType(flowElement);
+ if (ObjectUtils.equalsAny(approveType,
+ BpmUserTaskApproveTypeEnum.AUTO_APPROVE.getType(),
+ BpmUserTaskApproveTypeEnum.AUTO_REJECT.getType())) {
+ return new HashSet<>();
+ }
+
+ // 1.1 计算任务的候选人
+ Integer strategy = BpmnModelUtils.parseCandidateStrategy(flowElement);
+ String param = BpmnModelUtils.parseCandidateParam(flowElement);
+ Set userIds = getCandidateStrategy(strategy).calculateUsersByActivity(bpmnModel, activityId, param,
+ startUserId, processDefinitionId, processVariables);
+ // 1.2 移除被禁用的用户
+ removeDisableUsers(userIds);
+
+ // 2. 候选人为空时，根据“审批人为空”的配置补充
+ if (CollUtil.isEmpty(userIds)) {
+ userIds = getCandidateStrategy(BpmTaskCandidateStrategyEnum.ASSIGN_EMPTY.getStrategy())
+ .calculateUsersByActivity(bpmnModel, activityId, param, startUserId, processDefinitionId, processVariables);
+ // ASSIGN_EMPTY 策略，不需要移除被禁用的用户。原因是，再移除，可能会出现更没审批人了！！！
+ }
+
+ // 3. 移除发起人的用户
+ removeStartUserIfSkip(userIds, flowElement, startUserId);
return userIds;
}
@@ -104,10 +161,31 @@ public class BpmTaskCandidateInvoker {
Map userMap = adminUserApi.getUserMap(assigneeUserIds);
assigneeUserIds.removeIf(id -> {
AdminUserRespDTO user = userMap.get(id);
- return user == null || !CommonStatusEnum.ENABLE.getStatus().equals(user.getStatus());
+ return user == null || CommonStatusEnum.isDisable(user.getStatus());
});
}
+ /**
+ * 如果“审批人与发起人相同时”，配置了 SKIP 跳过，则移除发起人
+ *
+ * 注意：如果只有一个候选人，则不处理，避免无法审批
+ *
+ * @param assigneeUserIds 当前分配的候选人
+ * @param flowElement 当前节点
+ * @param startUserId 发起人
+ */
+ @VisibleForTesting
+ void removeStartUserIfSkip(Set assigneeUserIds, FlowElement flowElement, Long startUserId) {
+ if (CollUtil.size(assigneeUserIds) <= 1) {
+ return;
+ }
+ Integer assignStartUserHandlerType = BpmnModelUtils.parseAssignStartUserHandlerType(flowElement);
+ if (ObjectUtil.notEqual(assignStartUserHandlerType, BpmUserTaskAssignStartUserHandlerTypeEnum.SKIP.getType())) {
+ return;
+ }
+ assigneeUserIds.remove(startUserId);
+ }
+
private BpmTaskCandidateStrategy getCandidateStrategy(Integer strategy) {
BpmTaskCandidateStrategyEnum strategyEnum = BpmTaskCandidateStrategyEnum.valueOf(strategy);
Assert.notNull(strategyEnum, "策略(%s) 不存在", strategy);
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateStrategy.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateStrategy.java
index 1534d39c28..90eb37c96d 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateStrategy.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateStrategy.java
@@ -1,13 +1,15 @@
package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
+import org.flowable.bpmn.model.BpmnModel;
import org.flowable.engine.delegate.DelegateExecution;
+import java.util.Map;
import java.util.Set;
/**
* BPM 任务的候选人的策略接口
- *
+ *
* 例如说：分配审批人
*
* @author 芋道源码
@@ -29,20 +31,55 @@ public interface BpmTaskCandidateStrategy {
void validateParam(String param);
/**
- * 基于执行任务，获得任务的候选用户们
+ * 是否一定要输入参数
+ *
+ * @return 是否
+ */
+ default boolean isParamRequired() {
+ return true;
+ }
+
+ /**
+ * 基于候选人参数，获得任务的候选用户们
+ *
+ * 注意：实现 calculateUsers 系列方法时，有两种选择：
+ * 1. 只重写 calculateUsers 默认方法
+ * 2. 都重写 calculateUsersByTask 和 calculateUsersByActivity 两个方法
+ *
+ * @param param 执行任务
+ * @return 用户编号集合
+ */
+ default Set calculateUsers(String param) {
+ throw new UnsupportedOperationException("该分配方法未实现，请检查！");
+ }
+
+ /**
+ * 基于【执行任务】，获得任务的候选用户们
*
* @param execution 执行任务
* @return 用户编号集合
*/
- Set calculateUsers(DelegateExecution execution, String param);
+ default Set calculateUsersByTask(DelegateExecution execution, String param) {
+ return calculateUsers(param);
+ }
/**
- * 是否一定要输入参数
+ * 基于【流程活动】，获得任务的候选用户们
+ *
+ * 目的：用于获取未执行节点的候选用户们
*
- * @return 是否
+ * @param bpmnModel 流程图
+ * @param activityId 活动 ID (对应 Bpmn XML id)
+ * @param param 节点的参数
+ * @param startUserId 流程发起人编号
+ * @param processDefinitionId 流程定义编号
+ * @param processVariables 流程变量
+ * @return 用户编号集合
*/
- default boolean isParamRequired() {
- return true;
+ @SuppressWarnings("unused")
+ default Set calculateUsersByActivity(BpmnModel bpmnModel, String activityId, String param,
+ Long startUserId, String processDefinitionId, Map processVariables) {
+ return calculateUsers(param);
}
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/AbstractBpmTaskCandidateDeptLeaderStrategy.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/AbstractBpmTaskCandidateDeptLeaderStrategy.java
new file mode 100644
index 0000000000..edd97b8c74
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/AbstractBpmTaskCandidateDeptLeaderStrategy.java
@@ -0,0 +1,94 @@
+package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.dept;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+
+import javax.annotation.Resource;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 部门的负责人 {@link BpmTaskCandidateStrategy} 抽象类
+ *
+ * @author jason
+ */
+public abstract class AbstractBpmTaskCandidateDeptLeaderStrategy implements BpmTaskCandidateStrategy {
+
+ @Resource
+ protected DeptApi deptApi;
+ @Resource
+ protected AdminUserApi adminUserApi;
+
+ /**
+ * 获得指定层级的部门负责人，只有第 level 的负责人
+ *
+ * @param dept 指定部门
+ * @param level 第几级
+ * @return 部门负责人的编号
+ */
+ protected Long getAssignLevelDeptLeaderId(DeptRespDTO dept, Integer level) {
+ Assert.isTrue(level > 0, "level 必须大于 0");
+ if (dept == null) {
+ return null;
+ }
+ DeptRespDTO currentDept = dept;
+ for (int i = 1; i < level; i++) {
+ DeptRespDTO parentDept = deptApi.getDept(currentDept.getParentId());
+ if (parentDept == null) { // 找不到父级部门，到了最高级。返回最高级的部门负责人
+ break;
+ }
+ currentDept = parentDept;
+ }
+ return currentDept.getLeaderUserId();
+ }
+
+ /**
+ * 获得连续层级的部门负责人，包含 [1, level] 的负责人
+ *
+ * @param deptIds 指定部门编号数组
+ * @param level 最大层级
+ * @return 连续部门负责人 Id
+ */
+ protected Set getMultiLevelDeptLeaderIds(List deptIds, Integer level) {
+ Assert.isTrue(level > 0, "level 必须大于 0");
+ if (CollUtil.isEmpty(deptIds)) {
+ return new HashSet<>();
+ }
+ Set deptLeaderIds = new LinkedHashSet<>(); // 保证有序
+ for (Long deptId : deptIds) {
+ DeptRespDTO dept = deptApi.getDept(deptId);
+ for (int i = 0; i < level; i++) {
+ if (dept.getLeaderUserId() != null) {
+ deptLeaderIds.add(dept.getLeaderUserId());
+ }
+ DeptRespDTO parentDept = deptApi.getDept(dept.getParentId());
+ if (parentDept == null) { // 找不到父级部门. 已经到了最高层级了
+ break;
+ }
+ dept = parentDept;
+ }
+ }
+ return deptLeaderIds;
+ }
+
+ /**
+ * 获取发起人的部门
+ *
+ * @param startUserId 发起人 Id
+ */
+ protected DeptRespDTO getStartUserDept(Long startUserId) {
+ AdminUserRespDTO startUser = adminUserApi.getUser(startUserId);
+ if (startUser.getDeptId() == null) { // 找不到部门
+ return null;
+ }
+ return deptApi.getDept(startUser.getDeptId());
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderMultiStrategy.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderMultiStrategy.java
new file mode 100644
index 0000000000..ce8b2accb6
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderMultiStrategy.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.dept;
+
+import cn.hutool.core.lang.Assert;
+import cn.iocoder.yudao.framework.common.util.string.StrUtils;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 连续多级部门的负责人 {@link BpmTaskCandidateStrategy} 实现类
+ *
+ * @author jason
+ */
+@Component
+public class BpmTaskCandidateDeptLeaderMultiStrategy extends AbstractBpmTaskCandidateDeptLeaderStrategy {
+
+ @Override
+ public BpmTaskCandidateStrategyEnum getStrategy() {
+ return BpmTaskCandidateStrategyEnum.MULTI_DEPT_LEADER_MULTI;
+ }
+
+ @Override
+ public void validateParam(String param) {
+ // 参数格式: | 分隔：1）左边为部门（多个部门用 , 分隔）。2）右边为部门层级
+ String[] params = param.split("\\|");
+ Assert.isTrue(params.length == 2, "参数格式不匹配");
+ List deptIds = StrUtils.splitToLong(params[0], ",");
+ int level = Integer.parseInt(params[1]);
+ // 校验部门存在
+ deptApi.validateDeptList(deptIds);
+ Assert.isTrue(level > 0, "部门层级必须大于 0");
+ }
+
+ @Override
+ public Set calculateUsers(String param) {
+ String[] params = param.split("\\|");
+ List deptIds = StrUtils.splitToLong(params[0], ",");
+ int level = Integer.parseInt(params[1]);
+ return super.getMultiLevelDeptLeaderIds(deptIds, level);
+ }
+
+}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategy.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategy.java
new file mode 100644
index 0000000000..88228bf589
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategy.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.dept;
+
+import cn.iocoder.yudao.framework.common.util.string.StrUtils;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Set;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+
+/**
+ * 部门的负责人 {@link BpmTaskCandidateStrategy} 实现类
+ *
+ * @author kyle
+ */
+@Component
+public class BpmTaskCandidateDeptLeaderStrategy implements BpmTaskCandidateStrategy {
+
+ @Resource
+ private DeptApi deptApi;
+
+ @Override
+ public BpmTaskCandidateStrategyEnum getStrategy() {
+ return BpmTaskCandidateStrategyEnum.DEPT_LEADER;
+ }
+
+ @Override
+ public void validateParam(String param) {
+ Set deptIds = StrUtils.splitToLongSet(param);
+ deptApi.validateDeptList(deptIds);
+ }
+
+ @Override
+ public Set calculateUsers(String param) {
+ Set deptIds = StrUtils.splitToLongSet(param);
+ List depts = deptApi.getDeptList(deptIds);
+ return convertSet(depts, DeptRespDTO::getLeaderUserId);
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategy.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategy.java
new file mode 100644
index 0000000000..7ebd8daab4
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategy.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.dept;
+
+import cn.iocoder.yudao.framework.common.util.string.StrUtils;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Set;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+
+/**
+ * 部门的成员 {@link BpmTaskCandidateStrategy} 实现类
+ *
+ * @author kyle
+ */
+@Component
+public class BpmTaskCandidateDeptMemberStrategy implements BpmTaskCandidateStrategy {
+
+ @Resource
+ private DeptApi deptApi;
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @Override
+ public BpmTaskCandidateStrategyEnum getStrategy() {
+ return BpmTaskCandidateStrategyEnum.DEPT_MEMBER;
+ }
+
+ @Override
+ public void validateParam(String param) {
+ Set deptIds = StrUtils.splitToLongSet(param);
+ deptApi.validateDeptList(deptIds);
+ }
+
+ @Override
+ public Set calculateUsers(String param) {
+ Set deptIds = StrUtils.splitToLongSet(param);
+ List