From 80375502241fde86309263f07502a0776872bb62 Mon Sep 17 00:00:00 2001
From: tzwang <wtz1003@sina.com>
Date: Tue, 21 May 2024 16:31:12 +0800
Subject: [PATCH] fix taskresult bugs

Former-commit-id: b906f3f0a67dc9c845c46ca1002f69343ca1c3cb
---
 api/internal/logic/core/pagelisttasklogic.go     | 1 +
 api/internal/scheduler/schedulers/aiScheduler.go | 3 ++-
 api/internal/storeLink/octopus.go                | 8 ++++++--
 api/internal/storeLink/shuguangai.go             | 8 ++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/api/internal/logic/core/pagelisttasklogic.go b/api/internal/logic/core/pagelisttasklogic.go
index e41e7474..c7be973b 100644
--- a/api/internal/logic/core/pagelisttasklogic.go
+++ b/api/internal/logic/core/pagelisttasklogic.go
@@ -146,6 +146,7 @@ func (l *PageListTaskLogic) updateTaskStatus(tasklist []*types.TaskModel, ch cha
 
 	for i := len(aiTask) - 1; i >= 0; i-- {
 		if aiTask[i].StartTime == "" {
+			task.Status = aiTask[i].Status
 			aiTask = append(aiTask[:i], aiTask[i+1:]...)
 		}
 	}
diff --git a/api/internal/scheduler/schedulers/aiScheduler.go b/api/internal/scheduler/schedulers/aiScheduler.go
index 2a177b2b..7979f966 100644
--- a/api/internal/scheduler/schedulers/aiScheduler.go
+++ b/api/internal/scheduler/schedulers/aiScheduler.go
@@ -185,8 +185,9 @@ func (as *AiScheduler) AssignTask(clusters []*strategy.AssignedCluster) (interfa
 					return
 				}
 
+				result := &AiResult{}
 				mu.Lock()
-				result, _ := convertType(resp)
+				result, _ = convertType(resp)
 				mu.Unlock()
 
 				result.Replica = c.Replicas
diff --git a/api/internal/storeLink/octopus.go b/api/internal/storeLink/octopus.go
index 77d957d9..53c3652c 100644
--- a/api/internal/storeLink/octopus.go
+++ b/api/internal/storeLink/octopus.go
@@ -520,8 +520,12 @@ func (o *OctopusLink) GetTrainingTask(ctx context.Context, taskId string) (*coll
 	}
 	var task collector.Task
 	task.Id = jobresp.Payload.TrainJob.Id
-	task.Start = time.Unix(jobresp.Payload.TrainJob.StartedAt, 0).Format(constants.Layout)
-	task.End = time.Unix(jobresp.Payload.TrainJob.CompletedAt, 0).Format(constants.Layout)
+	if jobresp.Payload.TrainJob.StartedAt != 0 {
+		task.Start = time.Unix(jobresp.Payload.TrainJob.StartedAt, 0).Format(constants.Layout)
+	}
+	if jobresp.Payload.TrainJob.CompletedAt != 0 {
+		task.End = time.Unix(jobresp.Payload.TrainJob.CompletedAt, 0).Format(constants.Layout)
+	}
 	switch jobresp.Payload.TrainJob.Status {
 	case "succeeded":
 		task.Status = constants.Completed
diff --git a/api/internal/storeLink/shuguangai.go b/api/internal/storeLink/shuguangai.go
index cd17229a..2aa2a68c 100644
--- a/api/internal/storeLink/shuguangai.go
+++ b/api/internal/storeLink/shuguangai.go
@@ -521,8 +521,12 @@ func (s *ShuguangAi) GetTrainingTask(ctx context.Context, taskId string) (*colle
 	}
 	var task collector.Task
 	task.Id = jobresp.Data.Id
-	task.Start = jobresp.Data.StartTime
-	task.End = jobresp.Data.EndTime
+	if jobresp.Data.StartTime != "" {
+		task.Start = jobresp.Data.StartTime
+	}
+	if jobresp.Data.EndTime != "" {
+		task.End = jobresp.Data.EndTime
+	}
 	task.Status = jobresp.Data.Status
 
 	return &task, nil