From 7bc4e121c2739ef2b4bef5228e42511448286d6e Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Fri, 8 Dec 2023 19:17:29 +0800 Subject: [PATCH] =?UTF-8?q?p=E7=AB=AFid=E8=BF=94=E5=9B=9E=E6=94=B9?= =?UTF-8?q?=E6=88=90string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: f77e73db57ea08c22b78e255ca41dfa7c3f86e88 --- api/desc/core/pcm-core.api | 2 +- api/internal/logic/apps/applistlogic.go | 3 ++- api/internal/types/types.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/desc/core/pcm-core.api b/api/desc/core/pcm-core.api index b6077ad1..a5d03627 100644 --- a/api/desc/core/pcm-core.api +++ b/api/desc/core/pcm-core.api @@ -624,7 +624,7 @@ type ( StartTime string `json:"startTime"` EndTime string `json:"endTime"` ParticipantStatus string `json:"participantStatus"` - ParticipantId int64 `json:"participantId"` + ParticipantId string `json:"participantId"` ParticipantName string `json:"participantName"` Storage string `json:"storage"` CreateTime string `json:"createTime"` diff --git a/api/internal/logic/apps/applistlogic.go b/api/internal/logic/apps/applistlogic.go index 1d9f4eee..d9a8ae24 100644 --- a/api/internal/logic/apps/applistlogic.go +++ b/api/internal/logic/apps/applistlogic.go @@ -4,6 +4,7 @@ import ( "context" "gorm.io/datatypes" "gorm.io/gorm" + "strconv" "time" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" @@ -61,7 +62,7 @@ func (l *AppListLogic) AppList(req *types.AppListReq) (resp *types.AppListResp, StartTime: task.StartTime, EndTime: task.EndTime, CreateTime: task.CommitTime.Format("2006-01-02 15:04:05"), - ParticipantId: task.PId, + ParticipantId: strconv.FormatInt(task.PId, 10), ParticipantName: task.PName, Replicas: replicas, }) diff --git a/api/internal/types/types.go b/api/internal/types/types.go index ce8e2419..b8886f7a 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -589,7 +589,7 @@ type App struct { StartTime string `json:"startTime"` EndTime string `json:"endTime"` ParticipantStatus string `json:"participantStatus"` - ParticipantId int64 `json:"participantId"` + ParticipantId string `json:"participantId"` ParticipantName string `json:"participantName"` Storage string `json:"storage"` CreateTime string `json:"createTime"`