From 504b3e95d9e90ff0441e777fae78485d7723cd43 Mon Sep 17 00:00:00 2001
From: tzwang <wtz1003@sina.com>
Date: Wed, 26 Jun 2024 09:28:08 +0800
Subject: [PATCH] fix crontask bug

Former-commit-id: 0a317a3ff1e27eb3d9a774bb0ba9536248fa3586
---
 api/internal/cron/aiCronTask.go | 37 +++++++--------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/api/internal/cron/aiCronTask.go b/api/internal/cron/aiCronTask.go
index 4ad76deb..254a16e6 100644
--- a/api/internal/cron/aiCronTask.go
+++ b/api/internal/cron/aiCronTask.go
@@ -174,7 +174,7 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
 	}
 
 	// Update Infer Task Status
-	if task.TaskTypeDict == 11 {
+	if task.TaskTypeDict == 11 || task.TaskTypeDict == 12 {
 		UpdateInferTaskStatus(svc, task)
 		return
 	}
@@ -229,30 +229,14 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
 		return
 	}
 
-	var start time.Time
-	var end time.Time
-	// distinguish train or infer temporarily
-	if task.TaskTypeDict == 11 {
-		start, _ = time.ParseInLocation(time.RFC3339, aiTask[0].StartTime, time.Local)
-		end, _ = time.ParseInLocation(time.RFC3339, aiTask[0].EndTime, time.Local)
-	} else {
-		start, _ = time.ParseInLocation(constants.Layout, aiTask[0].StartTime, time.Local)
-		end, _ = time.ParseInLocation(constants.Layout, aiTask[0].EndTime, time.Local)
-	}
+	start, _ := time.ParseInLocation(constants.Layout, aiTask[0].StartTime, time.Local)
+	end, _ := time.ParseInLocation(constants.Layout, aiTask[0].EndTime, time.Local)
 
 	var status string
 	var count int
 	for _, a := range aiTask {
-		var s time.Time
-		var e time.Time
-		// distinguish train or infer temporarily
-		if task.TaskTypeDict == 11 {
-			s, _ = time.ParseInLocation(time.RFC3339, a.StartTime, time.Local)
-			e, _ = time.ParseInLocation(time.RFC3339, a.EndTime, time.Local)
-		} else {
-			s, _ = time.ParseInLocation(constants.Layout, a.StartTime, time.Local)
-			e, _ = time.ParseInLocation(constants.Layout, a.EndTime, time.Local)
-		}
+		s, _ := time.ParseInLocation(constants.Layout, a.StartTime, time.Local)
+		e, _ := time.ParseInLocation(constants.Layout, a.EndTime, time.Local)
 
 		if s.Before(start) {
 			start = s
@@ -289,15 +273,8 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
 
 	if status != "" {
 		task.Status = status
-		// distinguish train or infer temporarily
-		if task.TaskTypeDict == 11 {
-			task.StartTime = start.Format(time.RFC3339)
-			task.EndTime = end.Format(time.RFC3339)
-		} else {
-			task.StartTime = start.Format(constants.Layout)
-			task.EndTime = end.Format(constants.Layout)
-		}
-
+		task.StartTime = start.Format(constants.Layout)
+		task.EndTime = end.Format(constants.Layout)
 	}
 
 	task.UpdatedTime = time.Now().Format(constants.Layout)