From 34503a2e9a29418346a4ac8f84170ab8f4321d6e Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 19 三月 2026 15:19:05 +0800
Subject: [PATCH] lsh#行号适配

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskInstance.java |   14 ++++++++++++++
 1 files changed, 14 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..e2ab3f8 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;
@@ -377,3 +390,4 @@
     }
 
 }
+

--
Gitblit v1.9.1