From 88c6cf4480eca01b8d049c580a6f39071fc07949 Mon Sep 17 00:00:00 2001
From: liyang <liyang1987jay@163.com>
Date: Fri, 13 Dec 2024 16:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E7=90=86=E9=99=84=E4=BB=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/workflow/domain/bo/CompleteTaskBo.java | 6 ++++++
 .../dromara/workflow/service/impl/FlwTaskServiceImpl.java   | 2 ++
 .../workflow/service/impl/TaskAssigneeTranslationImpl.java  | 2 --
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
index b83942a71..b6d4cce1e 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
@@ -54,6 +54,12 @@ public class CompleteTaskBo implements Serializable {
      */
     private Map<String, Object> variables;
 
+    /**
+     * 扩展变量(此处为逗号分隔的ossId)
+     * @return
+     */
+    private String ext;
+
     public Map<String, Object> getVariables() {
         if (variables == null) {
             return new HashMap<>(16);
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
index 8cbdefd07..9d9ecad0a 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
@@ -165,6 +165,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
             flowParams.skipType(SkipType.PASS.getKey());
             flowParams.message(completeTaskBo.getMessage());
             flowParams.flowStatus(BusinessStatusEnum.WAITING.getStatus()).hisStatus(TaskStatusEnum.PASS.getStatus());
+
+            flowParams.hisTaskExt(completeTaskBo.getFileId());
             // 执行任务跳转，并根据返回的处理人设置下一步处理人
             setHandler(taskService.skip(taskId, flowParams), flowTask, wfCopyList);
             return true;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TaskAssigneeTranslationImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TaskAssigneeTranslationImpl.java
index ef2f53068..52d5fa4ff 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TaskAssigneeTranslationImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TaskAssigneeTranslationImpl.java
@@ -1,6 +1,5 @@
 package org.dromara.workflow.service.impl;
 
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.translation.annotation.TranslationType;
@@ -17,7 +16,6 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @RequiredArgsConstructor
 @Service
-@AllArgsConstructor
 @TranslationType(type = TransConstant.TASK_ID_TO_ASSIGNEE)
 public class TaskAssigneeTranslationImpl implements TranslationInterface<String> {