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/service/task/BpmProcessInstanceCopyService.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/task/BpmProcessInstanceCopyService.java b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/task/BpmProcessInstanceCopyService.java
index 8d37b1b..894e2f6 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/task/BpmProcessInstanceCopyService.java
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/task/BpmProcessInstanceCopyService.java
@@ -3,7 +3,9 @@
 import com.iailab.framework.common.pojo.PageResult;
 import com.iailab.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCopyPageReqVO;
 import com.iailab.module.bpm.dal.dataobject.task.BpmProcessInstanceCopyDO;
+import org.flowable.bpmn.model.FlowNode;
 
+import javax.validation.constraints.NotEmpty;
 import java.util.Collection;
 
 /**
@@ -14,12 +16,29 @@
 public interface BpmProcessInstanceCopyService {
 
     /**
-     * 流程实例的抄送
+     * 【管理员】流程实例的抄送
      *
      * @param userIds 抄送的用户编号
+     * @param reason 抄送意见
      * @param taskId 流程任务编号
      */
-    void createProcessInstanceCopy(Collection<Long> userIds, String taskId);
+    void createProcessInstanceCopy(Collection<Long> userIds, String reason, String taskId);
+
+    /**
+     * 【自动抄送】流程实例的抄送
+     *
+     * @param userIds 抄送的用户编号
+     * @param reason 抄送意见
+     * @param processInstanceId 流程编号
+     * @param activityId 流程活动编号(对应 {@link FlowNode#getId()})
+     * @param activityName 任务编号(对应 {@link FlowNode#getName()})
+     * @param taskId 任务编号,允许空
+     */
+    void createProcessInstanceCopy(Collection<Long> userIds, String reason,
+                                   @NotEmpty(message = "流程实例编号不能为空") String processInstanceId,
+                                   @NotEmpty(message = "流程活动编号不能为空") String activityId,
+                                   @NotEmpty(message = "流程活动名字不能为空") String activityName,
+                                   String taskId);
 
     /**
      * 获得抄送的流程的分页

--
Gitblit v1.9.3