From 477df1fb00f9bf789de43364421d9e49a01057e1 Mon Sep 17 00:00:00 2001 From: tzwang Date: Tue, 21 May 2024 10:18:50 +0800 Subject: [PATCH 1/2] fix tasklist bugs Former-commit-id: 689adf62b5cd055f339458d268fc1d012e72b87e --- api/internal/logic/core/pagelisttasklogic.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/internal/logic/core/pagelisttasklogic.go b/api/internal/logic/core/pagelisttasklogic.go index 20f3d641..edaee318 100644 --- a/api/internal/logic/core/pagelisttasklogic.go +++ b/api/internal/logic/core/pagelisttasklogic.go @@ -86,7 +86,7 @@ func (l *PageListTaskLogic) PageListTask(req *types.PageTaskReq) (resp *types.Pa } func (l *PageListTaskLogic) updateTaskStatus(tasklist []*types.TaskModel, ch chan<- struct{}) { - var list []*types.TaskModel + list := make([]*types.TaskModel, len(tasklist)) copy(list, tasklist) for i := len(list) - 1; i >= 0; i-- { if list[i].AdapterTypeDict != 1 || list[i].Status == constants.Succeeded || list[i].Status == constants.Failed { @@ -209,7 +209,7 @@ func (l *PageListTaskLogic) updateTaskStatus(tasklist []*types.TaskModel, ch cha } func (l *PageListTaskLogic) updateAiTaskStatus(tasklist []*types.TaskModel, ch chan<- struct{}) { - var list []*types.TaskModel + list := make([]*types.TaskModel, len(tasklist)) copy(list, tasklist) for i := len(list) - 1; i >= 0; i-- { if list[i].AdapterTypeDict != 1 || list[i].Status == constants.Succeeded || list[i].Status == constants.Failed { From d4db154bc7352426116d12df260eda653b24a967 Mon Sep 17 00:00:00 2001 From: tzwang Date: Tue, 21 May 2024 10:50:13 +0800 Subject: [PATCH 2/2] fix tasklist time bugs Former-commit-id: f86a6d74faf21d9ecd248512dfe5316e50ac6fcf --- api/internal/logic/core/pagelisttasklogic.go | 4 ++-- pkg/constants/time.go | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/api/internal/logic/core/pagelisttasklogic.go b/api/internal/logic/core/pagelisttasklogic.go index edaee318..45a826f8 100644 --- a/api/internal/logic/core/pagelisttasklogic.go +++ b/api/internal/logic/core/pagelisttasklogic.go @@ -101,8 +101,8 @@ func (l *PageListTaskLogic) updateTaskStatus(tasklist []*types.TaskModel, ch cha task := list[0] for i := range list { - earliest, _ := time.Parse(constants.Layout, task.UpdatedTime) - latest, _ := time.Parse(constants.Layout, list[i].UpdatedTime) + earliest, _ := time.Parse(constants.Layout_temp, task.UpdatedTime) + latest, _ := time.Parse(constants.Layout_temp, list[i].UpdatedTime) if latest.Before(earliest) { task = list[i] } diff --git a/pkg/constants/time.go b/pkg/constants/time.go index deecc715..7a1469ef 100644 --- a/pkg/constants/time.go +++ b/pkg/constants/time.go @@ -1,3 +1,6 @@ package constants -const Layout = "2006-01-02 15:04:05" +const ( + Layout = "2006-01-02 15:04:05" + Layout_temp = "2006-01-02T15:04:05Z07:00" +)