jjxu/fonchain-artistinfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'xjjdev'

Browse Source
This commit is contained in:
徐俊杰 2023-04-01 10:03:23 +08:00
commit 77ddfb385a
1 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
cmd/internal/logic/artistinfo_artwork.go
View File

@ -135,67 +135,66 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
}) })
} }
//// 方案1： 画作在画作系统被删除了，继续展示，只是数据只有artowrkUid，其它的都没了，查询详情会报错not found //// 方案1： 画作在画作系统被删除了，继续展示，只是数据只有artowrkUid，其它的都没了，查询详情会报错not found
var thisArtwork = &artistInfoArtwork.ArtworkPreviewInfo{ // var thisArtwork = &artistInfoArtwork.ArtworkPreviewInfo{
ArtistUuid: v.ArtistUid, // ArtistUuid: v.ArtistUid,
ArtworkUid: v.ArtworkUid, // ArtworkUid: v.ArtworkUid,
LockStatus: int32(v.Status), // LockStatus: int32(v.Status),
BaseAuditStatus: v.BaseAuditStatus, // BaseAuditStatus: v.BaseAuditStatus,
BaseAuditMark: v.BaseAuditMark, // BaseAuditMark: v.BaseAuditMark,
BaseAuditMark2: v.BaseAuditMark2, // BaseAuditMark2: v.BaseAuditMark2,
SupplementAuditStatus: v.SupplementAuditStatus, // SupplementAuditStatus: v.SupplementAuditStatus,
SupplementAuditMark: v.SupplementAuditMark, // SupplementAuditMark: v.SupplementAuditMark,
SupplementAuditMark2: v.SupplementAuditMark2, // SupplementAuditMark2: v.SupplementAuditMark2,
AuditFlowIndex: v.AuditFlowIndex, // AuditFlowIndex: v.AuditFlowIndex,
CreatedAt: v.CreatedAt, // CreatedAt: v.CreatedAt,
UpdatedAt: v.UpdatedAt, // UpdatedAt: v.UpdatedAt,
DeletedAt: v.DeletedAt, // DeletedAt: v.DeletedAt,
} // }
// for _, artwork := range previewListRes.Data {
// if artwork.ArtworkUid == v.ArtworkUid {
// 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
// break
// }
// }
// res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, thisArtwork)
//// 方案2：画作如果被画作系统删除，则不展示被删除的内容
for _, artwork := range previewListRes.Data { for _, artwork := range previewListRes.Data {
if artwork.ArtworkUid == v.ArtworkUid { if artwork.ArtworkUid == v.ArtworkUid {
thisArtwork.ArtworkName = artwork.ArtworkName res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{
thisArtwork.Length = artwork.Length ArtworkName: artwork.ArtworkName,
thisArtwork.Width = artwork.Width Length: artwork.Length,
thisArtwork.Ruler = artwork.Ruler Width: artwork.Width,
thisArtwork.CreatedAddress = strings.Split(artwork.CreatedAddress, "，") Ruler: artwork.Ruler,
thisArtwork.ArtistPhoto = artwork.ArtistPhoto CreatedAddress: strings.Split(artwork.CreatedAddress, "，"),
thisArtwork.HdPic = artwork.HdPic ArtistPhoto: artwork.ArtistPhoto,
thisArtwork.ArtworkUid = artwork.ArtworkUid HdPic: artwork.HdPic,
thisArtwork.CreatedDate = artwork.CreateDate CreatedDate: artwork.CreateDate,
LockStatus: int32(v.Status),
ArtistUuid: v.ArtistUid,
ArtworkUid: v.ArtworkUid,
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,
})
break break
} }
} }
res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, thisArtwork)
//// 方案2：画作如果被画作系统删除，则不展示被删除的内容
// for _, artwork := range previewListRes.Data {
// if artwork.ArtworkUid == v.ArtworkUid {
// res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{
// ArtworkName: artwork.ArtworkName,
// Length: artwork.Length,
// Width: artwork.Width,
// Ruler: artwork.Ruler,
// CreatedAddress: strings.Split(artwork.CreatedAddress, "，"),
// ArtistPhoto: artwork.ArtistPhoto,
// HdPic: artwork.HdPic,
// CreatedDate: artwork.CreateDate,
// LockStatus: int32(v.Status),
// ArtistUuid: v.ArtistUid,
// ArtworkUid: v.ArtworkUid,
// 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,
// })
// break
// }
// }
// }
} }
return return
} }