diff --git a/cmd/internal/logic/artistinfo_artwork.go b/cmd/internal/logic/artistinfo_artwork.go index a5fc21c..f23a839 100644 --- a/cmd/internal/logic/artistinfo_artwork.go +++ b/cmd/internal/logic/artistinfo_artwork.go @@ -132,37 +132,62 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr if newGroup { res.GroupList = append(res.GroupList, &artistInfoArtwork.ArtworkLockRecord{ LockGroup: v.LockTime, - DataList: []*artistInfoArtwork.ArtworkPreviewInfo{}, + DataList: make([]*artistInfoArtwork.ArtworkPreviewInfo, 0), }) } + var thisArtwork = &artistInfoArtwork.ArtworkPreviewInfo{ + LockStatus: int32(v.Status), + BaseAuditStatus: v.BaseAuditStatus, + BaseAuditMark: v.BaseAuditMark, + BaseAuditMark2: v.BaseAuditMark2, + SupplementAuditStatus: v.SupplementAuditStatus, + SupplementAuditMark: v.SupplementAuditMark, + SupplementAuditMark2: v.SupplementAuditMark2, + AuditFlowIndex: v.AuditFlowIndex, + CreatedAt: v.CreatedAt, + UpdatedAt: v.UpdatedAt, + DeletedAt: v.DeletedAt, + } for _, artwork := range previewListRes.Data { if artwork.ArtworkUid == v.ArtworkUid { - res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{ - ArtistUuid: artwork.ArtistUuid, - ArtworkName: artwork.ArtworkName, - Length: artwork.Length, - Width: artwork.Width, - Ruler: artwork.Ruler, - CreatedAddress: strings.Split(artwork.CreatedAddress, ","), - ArtistPhoto: artwork.ArtistPhoto, - HdPic: artwork.HdPic, - ArtworkUid: artwork.ArtworkUid, - CreatedDate: artwork.CreateDate, - LockStatus: int32(v.Status), - BaseAuditStatus: v.BaseAuditStatus, - BaseAuditMark: v.BaseAuditMark, - BaseAuditMark2: v.BaseAuditMark2, - SupplementAuditStatus: v.SupplementAuditStatus, - SupplementAuditMark: v.SupplementAuditMark, - SupplementAuditMark2: v.SupplementAuditMark2, - AuditFlowIndex: v.AuditFlowIndex, - CreatedAt: v.CreatedAt, - UpdatedAt: v.UpdatedAt, - DeletedAt: v.DeletedAt, - }) + thisArtwork.ArtistUuid = artwork.ArtistUuid + thisArtwork.ArtworkName = artwork.ArtworkName + thisArtwork.Length = artwork.Length + thisArtwork.Width = artwork.Width + thisArtwork.Ruler = artwork.Ruler + thisArtwork.CreatedAddress = strings.Split(artwork.CreatedAddress, ",") + thisArtwork.ArtistPhoto = artwork.ArtistPhoto + thisArtwork.HdPic = artwork.HdPic + thisArtwork.ArtworkUid = artwork.ArtworkUid + thisArtwork.CreatedDate = artwork.CreateDate + + // res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{ + // ArtistUuid: artwork.ArtistUuid, + // ArtworkName: artwork.ArtworkName, + // Length: artwork.Length, + // Width: artwork.Width, + // Ruler: artwork.Ruler, + // CreatedAddress: strings.Split(artwork.CreatedAddress, ","), + // ArtistPhoto: artwork.ArtistPhoto, + // HdPic: artwork.HdPic, + // ArtworkUid: artwork.ArtworkUid, + // CreatedDate: artwork.CreateDate, + // LockStatus: int32(v.Status), + // BaseAuditStatus: v.BaseAuditStatus, + // BaseAuditMark: v.BaseAuditMark, + // BaseAuditMark2: v.BaseAuditMark2, + // SupplementAuditStatus: v.SupplementAuditStatus, + // SupplementAuditMark: v.SupplementAuditMark, + // SupplementAuditMark2: v.SupplementAuditMark2, + // AuditFlowIndex: v.AuditFlowIndex, + // CreatedAt: v.CreatedAt, + // UpdatedAt: v.UpdatedAt, + // DeletedAt: v.DeletedAt, + // }) } } + res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, artwork) } fmt.Println("previewListRes count", len(previewListRes.Data)) return