From ed8fc5f674544d3af63c6f68093ffc038385c493 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 十二月 2024 09:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java
index a4ab251..2e983bb 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java
@@ -7,6 +7,8 @@
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.flowable.bpmn.model.FlowNode;
+import org.flowable.task.api.history.HistoricTaskInstance;
/**
* 流程抄送 DO
@@ -51,19 +53,26 @@
* 冗余 ProcessInstance 的 category 字段
*/
private String category;
-
/**
- * 任务主键
+ * 流程活动的编号
+ * <p/>
*
- * 关联 Task 的 id 属性
+ * 冗余 {@link FlowNode#getId()}，对应 BPMN XML 节点编号
+ * 原因：用于查询抄送节点的表单字段权限。因为仿钉钉/飞书的抄送节点 (ServiceTask)，没有 taskId，只有 activityId
+ */
+ private String activityId;
+ /**
+ * 流程活动的名字
+ *
+ * 冗余 {@link FlowNode#getName()}
+ */
+ private String activityName;
+ /**
+ * 流程活动的编号
+ *
+ * 关联 {@link HistoricTaskInstance#getId()}
*/
private String taskId;
- /**
- * 任务名称
- *
- * 冗余 Task 的 name 属性
- */
- private String taskName;
/**
* 用户编号（被抄送的用户编号）
@@ -72,4 +81,9 @@
*/
private Long userId;
+ /**
+ * 抄送意见
+ */
+ private String reason;
+
}
--
Gitblit v1.9.3