From 7972683f56368cd8ce7ef8bb7f1d087416f4a3e7 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 13:23:35 +0800
Subject: [PATCH] 容器管理-编辑可入库区  选中数据排序  选择文字排序 兼容修改后的其他调用方法

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskInstance.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskInstance.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskInstance.java
index 4150acb..5315004 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskInstance.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskInstance.java
@@ -2,6 +2,8 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
+import com.vincent.rsf.server.manager.entity.Task;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -243,6 +245,17 @@
     private Date updateTime;
 
     public TaskInstance() {}
+    public TaskInstance(TaskPathTemplateMerge taskPathTemplateMerge, Task task) {
+        this.templateId = taskPathTemplateMerge.getId();
+        this.templateCode = taskPathTemplateMerge.getTemplateCode();
+        this.templateVersion = taskPathTemplateMerge.getVersion();
+        this.sourceCode = taskPathTemplateMerge.getSourceType();
+        this.targetCode = taskPathTemplateMerge.getTargetType();
+//        this.sourceInfo = taskPathTemplateMerge.getSourceType();
+//        this.targetInfo = taskPathTemplateMerge.getTargetType();
+        this.taskNo = task.getTaskCode();
+        this.bizType = task.getTaskType$();
+    }
 
     public TaskInstance(String taskNo,String bizNo,String bizType,Long templateId,String templateCode,Integer templateVersion,String sourceInfo,String targetInfo,String sourceCode,String targetCode,String plannedPath,String actualPath,Short priority,Date timeoutAt,Short status,String currentNodeCode,String currentNodeName,Integer totalNodes,Integer completedNodes,Double progressRate,Integer estimatedDurationMinutes,Integer actualDurationMinutes,Date startTime,Date endTime,String resultCode,String resultMessage,String resultData,Integer retryTimes,Date lastRetryTime,String extParams,String remark,Long createBy,Long updateBy,Date createTime,Date updateTime) {
         this.taskNo = taskNo;

--
Gitblit v1.9.1