From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 0623905..9fdf484 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
@@ -1,9 +1,8 @@
package org.dromara.workflow.domain.bo;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
-import org.dromara.workflow.domain.vo.WfCopy;
import java.io.Serial;
import java.io.Serializable;
@@ -26,8 +25,8 @@
/**
* 浠诲姟id
*/
- @NotBlank(message = "浠诲姟id涓嶈兘涓虹┖", groups = {AddGroup.class})
- private String taskId;
+ @NotNull(message = "浠诲姟id涓嶈兘涓虹┖", groups = {AddGroup.class})
+ private Long taskId;
/**
* 闄勪欢id
@@ -37,7 +36,7 @@
/**
* 鎶勯�佷汉鍛�
*/
- private List<WfCopy> wfCopyList;
+ private List<FlowCopyBo> flowCopyList;
/**
* 娑堟伅绫诲瀷
@@ -50,10 +49,21 @@
private String message;
/**
+ * 娑堟伅閫氱煡
+ */
+ private String notice;
+
+ /**
* 娴佺▼鍙橀噺
*/
private Map<String, Object> variables;
+ /**
+ * 鎵╁睍鍙橀噺(姝ゅ涓洪�楀彿鍒嗛殧鐨刼ssId)
+ * @return
+ */
+ private String ext;
+
public Map<String, Object> getVariables() {
if (variables == null) {
return new HashMap<>(16);
--
Gitblit v1.9.3