Merge pull request '修复bug' (#1938) from fix-1852 into V20220415

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1938
Reviewed-by: lewis <747342561@qq.com>

models/cloudbrain.go

@@ -229,6 +229,18 @@ func ParseAndSetDurationFromCloudBrainOne(result JobResultPayload, task *Cloudbr
 	task.ComputeAndSetDuration()
 }
 
+func ParseAndSetDurationFromModelArtsNotebook(result *GetNotebook2Result, job *Cloudbrain) {
+	if job.StartTime == 0 && result.Lease.UpdateTime > 0 {
+		job.StartTime = timeutil.TimeStamp(result.Lease.UpdateTime / 1000)
+	}
+	job.Status = result.Status
+	if job.EndTime == 0 && IsModelArtsDebugJobTerminal(job.Status) {
+		job.EndTime = timeutil.TimeStampNow()
+	}
+	job.CorrectCreateUnix()
+	job.ComputeAndSetDuration()
+}
+
 type CloudbrainInfo struct {
 	Cloudbrain `xorm:"extends"`
 	User       `xorm:"extends"`

routers/repo/modelarts.go

@@ -267,6 +267,7 @@ func NotebookShow(ctx *context.Context) {
 		if task.DeletedAt.IsZero() { //normal record
 			if task.Status != result.Status {
 				task.Status = result.Status
+				models.ParseAndSetDurationFromModelArtsNotebook(result, task)
 				err = models.UpdateJob(task)
 				if err != nil {
 					ctx.Data["error"] = err.Error()