From b5b28e8b9c639f49e69efc60684e68bf642d1092 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 21 六月 2023 16:43:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/entity/FlowTaskDTO.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/entity/FlowTaskUserC.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/entity/FlowTaskDTO.java
similarity index 70%
rename from Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/entity/FlowTaskUserC.java
rename to Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/entity/FlowTaskDTO.java
index 8e77956..62ee9c6 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/entity/FlowTaskUserC.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/entity/FlowTaskDTO.java
@@ -20,6 +20,7 @@
import java.io.Serializable;
import java.util.List;
+import java.util.Map;
/**
* 娴佺▼鑺傜偣瀹℃牳浜烘敹钘�
@@ -27,12 +28,13 @@
* @author wang1
*/
@Data
-public class FlowTaskUserC implements Serializable {
+public class FlowTaskDTO implements Serializable {
private static final long serialVersionUID = 1L;
private String createdBy;
private String name;//淇濆瓨鐨勮繖涓敹钘忓悕绉�
+ private String processInstanceId;//娴佺▼瀹炰緥id
private String modelKey;
private String modelName;
private String processName;
@@ -46,5 +48,18 @@
private List<ProcessStageAttr> processStageAttr;//娴佺▼闃舵淇濆瓨鐨勫睘鎬�
private List<String> ids;//娴佺▼鍙戣捣涓紶閫掕繃鏉ョ殑鏁版嵁id
+ //娴佺▼椹冲洖璺緞
+ private String toName;//鍚屾剰銆侀┏鍥�
+ private String toTaskName;//鍚屾剰銆侀┏鍥炲埌鐨勪笅涓�涓妭鐐�
+ private String toTaskId;//鍚屾剰銆侀┏鍥炲埌鐨勪笅涓�涓妭鐐�
+ private String condition;//鍚屾剰銆侀┏鍥炲埌鐨勪笅涓�涓妭鐐圭殑鏉′欢
+ private String conditionKey;//鍚屾剰銆侀┏鍥炲埌鐨勪笅涓�涓妭鐐圭殑鏉′欢key
+ private String conditionValue;//鍚屾剰銆侀┏鍥炲埌鐨勪笅涓�涓妭鐐圭殑鏉′欢value
+
+ //娴佺▼涓弬鏁�
+ private List<FlowTaskDTO> toTasks;//娴佺▼涓嬩竴姝ユ寜閽�
+ private Map<String, Object> vars;//娴佺▼鍙傛暟
+
+
}
--
Gitblit v1.9.3