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/BackProcessBo.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
index d0f4369..3117a33 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
@@ -1,12 +1,16 @@
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 java.io.Serial;
import java.io.Serializable;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
/**
@@ -23,8 +27,13 @@
/**
* 浠诲姟ID
*/
- @NotBlank(message = "浠诲姟ID涓嶈兘涓虹┖", groups = AddGroup.class)
- private String taskId;
+ @NotNull(message = "浠诲姟ID涓嶈兘涓虹┖", groups = AddGroup.class)
+ private Long taskId;
+
+ /**
+ * 闄勪欢id
+ */
+ private String fileId;
/**
* 娑堟伅绫诲瀷
@@ -35,10 +44,28 @@
* 椹冲洖鐨勮妭鐐筰d(鐩墠鏈娇鐢紝鐩存帴椹冲洖鍒扮敵璇蜂汉)
*/
@NotBlank(message = "椹冲洖鐨勮妭鐐逛笉鑳戒负绌�", groups = AddGroup.class)
- private String targetActivityId;
+ private String nodeCode;
/**
* 鍔炵悊鎰忚
*/
private String message;
+
+ /**
+ * 閫氱煡
+ */
+ private String notice;
+
+ /**
+ * 娴佺▼鍙橀噺
+ */
+ private Map<String, Object> variables;
+
+ public Map<String, Object> getVariables() {
+ if (variables == null) {
+ return new HashMap<>(16);
+ }
+ variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
+ return variables;
+ }
}
--
Gitblit v1.9.3