From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-flowable/jnpf-flowable-entity/src/main/java/jnpf/flowable/model/task/FlowMethod.java |  256 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 256 insertions(+), 0 deletions(-)

diff --git a/jnpf-flowable/jnpf-flowable-entity/src/main/java/jnpf/flowable/model/task/FlowMethod.java b/jnpf-flowable/jnpf-flowable-entity/src/main/java/jnpf/flowable/model/task/FlowMethod.java
new file mode 100644
index 0000000..5d1e6f1
--- /dev/null
+++ b/jnpf-flowable/jnpf-flowable-entity/src/main/java/jnpf/flowable/model/task/FlowMethod.java
@@ -0,0 +1,256 @@
+package jnpf.flowable.model.task;
+
+import jnpf.base.UserInfo;
+import jnpf.flowable.entity.*;
+import jnpf.flowable.model.operator.AddSignModel;
+import jnpf.flowable.model.templatenode.FlowErrorModel;
+import jnpf.flowable.model.templatenode.TaskNodeModel;
+import jnpf.flowable.model.templatenode.nodejson.NodeModel;
+import jnpf.flowable.model.templatenode.nodejson.ProperCond;
+import jnpf.permission.entity.UserEntity;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 锛欽NPF寮�鍙戝钩鍙扮粍
+ * @version: V3.1.0
+ * @copyright 寮曡繄淇℃伅鎶�鏈湁闄愬叕鍙�
+ * @date 锛�2024/6/24 涓嬪崍4:57
+ */
+@Data
+@Accessors(chain = true)
+public class FlowMethod {
+    /**
+     * 浠诲姟涓婚敭
+     */
+    @Getter
+    @Setter
+    public String taskId;
+    /**
+     * 瀹℃壒瀵硅薄
+     */
+    private FlowModel flowModel;
+
+    //createOperator
+    /**
+     * 缁忓姙瀹炰綋
+     */
+    private OperatorEntity operatorEntity;
+    /**
+     * 鐘舵��
+     */
+    private Integer state;
+    /**
+     * 鑺傜偣
+     */
+    private NodeModel nodeModel;
+
+    //prevNodeList
+    /**
+     * flowable閮ㄧ讲id
+     */
+    private String deploymentId;
+    /**
+     * 鑺傜偣缂栫爜
+     */
+    private String nodeCode;
+    /**
+     * 鑺傜偣瀵硅薄
+     */
+    private List<TemplateNodeEntity> nodeEntityList;
+    private List<String> nodeCodeList;
+
+    //handleErrorRule
+    private List<FlowErrorModel> errorList;
+
+    //handleCondition
+    /**
+     * 琛ㄥ崟鏁版嵁
+     */
+    private Map<String, Object> formData = new HashMap<>();
+    /**
+     * 鑺傜偣闆嗗悎
+     */
+    private Map<String, NodeModel> nodes;
+    /**
+     * 浠诲姟
+     */
+    private TaskEntity taskEntity;
+
+    //completeNode
+    /**
+     * flowable涓婚敭
+     */
+    private String flowableTaskId;
+    /**
+     * 缁撴灉Map
+     */
+    private Map<String, Boolean> resMap = new HashMap<>();
+
+
+    //FlowDataModel
+    /**
+     * 鑺傜偣瀵硅薄
+     */
+    private TemplateNodeEntity nodeEntity;
+    // false 浠呮煡璇㈣〃鍗曟暟鎹�
+    /**
+     * 鏄惁淇濆瓨琛ㄥ崟鏁版嵁
+     */
+    private Boolean isAssign = true;
+
+    //getNextApprover
+    /**
+     * 涓嬩竴鑺傜偣
+     */
+    private List<NodeModel> nextNode = new ArrayList<>();
+
+
+    //RecordModel
+    /**
+     * 璁板綍鎿嶄綔绫诲瀷锛孯ecordEnum
+     */
+    private Integer type;
+    /**
+     * 娴佽浆鎿嶄綔浜猴紝濡傚姞绛剧粰璋�
+     */
+    private String userId;
+
+
+    //improperSort
+    /**
+     * 瀹℃壒鐢ㄦ埛
+     */
+    private List<String> userIds;
+
+
+    //TaskOperator
+    /**
+     * 寮傚父瑙勫垯
+     */
+    private Boolean errorRule = false;
+    /**
+     * 闄勫姞鏉′欢
+     */
+    private Boolean extraRule = false;
+    /**
+     * 榛樿瀹℃壒閫氳繃
+     */
+    private Integer pass = 0;
+    /**
+     * 鏃犳硶鎻愪氦
+     */
+    private Integer notSubmit = 0;
+    /**
+     * 涓婁竴鑺傜偣瀹℃壒浜烘寚瀹氬鐞嗕汉
+     */
+    private Integer node = 0;
+    /**
+     * 鏁版嵁浼犻�掔殑鏈�鍚庝竴鑺傜偣
+     */
+    private String resultNodeCode;
+    //getConditionResult
+    /**
+     * 鍑虹嚎闆嗗悎
+     */
+    private List<String> outgoingFlows;
+
+    /**
+     * 鏉′欢
+     */
+    private List<ProperCond> conditions;
+
+    /**
+     * 鏉′欢鍖归厤閫昏緫
+     */
+    private String matchLogic;
+
+    //checkPrint
+    /**
+     * 鎵撳嵃瀵硅薄
+     */
+    private List<TaskNodeModel> printNodeList;
+
+    private String handId;
+
+    /**
+     * 鏈粡杩囩殑鑺傜偣
+     */
+    private List<String> tobePass;
+    /**
+     * 褰撳墠鑺傜偣
+     */
+    private List<String> currentNodes;
+    /**
+     * 鏄惁绛炬敹
+     */
+    private Boolean signFor;
+
+    /**
+     * 瀹℃壒鏂瑰紡
+     */
+    private Integer handleStatus;
+
+    /**
+     * 鍔犵瀹℃壒鏂瑰紡
+     */
+    private AddSignModel addSignModel;
+
+    /**
+     * 褰撳墠鐢ㄦ埛
+     */
+    private UserEntity userEntity;
+
+    /**
+     * 鍒涘缓浜�
+     */
+    private UserEntity createUser;
+
+    /**
+     * 濮旀墭浜�
+     */
+    private UserEntity delegate;
+
+    /**
+     * 鐢ㄦ埛淇℃伅
+     */
+    private UserInfo userInfo;
+
+    /**
+     * 鎶勯�侀泦鍚�
+     */
+    List<CirculateEntity> circulateList = new ArrayList<>();
+
+    /**
+     * 鍊欓�変汉鎺ュ彛鏍囪瘑
+     */
+    private Boolean auditFlag = false;
+
+    /**
+     * 鑾峰彇涓嬩竴绾ц妭鐐癸紝鏄惁鑾峰彇瀛愭祦绋嬭妭鐐�
+     */
+    private Boolean nextSubFlow = false;
+
+    /**
+     * 瀛愭祦绋嬭〃鍗曟暟鎹�
+     */
+    private Map<String, Object> subFormData = new HashMap<>();
+
+    /**
+     * 鏄惁鎾ら攢娴佺▼
+     */
+    private Boolean isRevoke = false;
+
+    /**
+     * 閫愮骇鐢ㄦ埛
+     */
+    private LaunchUserEntity launchUser;
+
+}

--
Gitblit v1.8.0