Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

5 天以前 b8a67d701995d8b578e7c87617a5b8cd9b13a9db

 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;