From fc8b822a53db31fbdb67ad178999fd58d3e90603 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Wed, 29 Mar 2023 22:37:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=BB=E5=AE=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/internal/logic/artistinfo_artwork.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/internal/logic/artistinfo_artwork.go b/cmd/internal/logic/artistinfo_artwork.go index 78bdc4a..640d5b9 100644 --- a/cmd/internal/logic/artistinfo_artwork.go +++ b/cmd/internal/logic/artistinfo_artwork.go @@ -253,7 +253,7 @@ func (a ArtistInfoArtworkLogic) ArtworkStatic(request *artistInfoArtwork.ArtistA PageSize: int64(request.PageSize), Total: total, } - viewDatas, err := dao.PassedArtworkStatic(request, artistUids) + viewDatas, err := dao.PassedArtworkStatic(&artistInfoArtwork.ArtistArtworkStaticRequest{Page: 1, PageSize: -1}, artistUids) if err != nil { return nil, err } From 1eba4ba5bee3900ee078b637638944b0aa1da92a Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Sat, 1 Apr 2023 09:35:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E7=94=BB=E4=BD=9C=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/internal/logic/artistinfo_artwork.go | 59 +++++++++++++----------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/cmd/internal/logic/artistinfo_artwork.go b/cmd/internal/logic/artistinfo_artwork.go index efc0969..a5d7a94 100644 --- a/cmd/internal/logic/artistinfo_artwork.go +++ b/cmd/internal/logic/artistinfo_artwork.go @@ -134,6 +134,7 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr DataList: make([]*artistInfoArtwork.ArtworkPreviewInfo, 0), }) } + //// 方案1： 画作在画作系统被删除了，继续展示，只是数据只有artowrkUid，其它的都没了，查询详情会报错not found var thisArtwork = &artistInfoArtwork.ArtworkPreviewInfo{ ArtistUuid: v.ArtistUid, ArtworkUid: v.ArtworkUid, @@ -160,35 +161,41 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr 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, - // }) - + 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 + // } + // } + // } fmt.Println("previewListRes count", len(previewListRes.Data)) return } From 747212fd29dde10aec87b327be8df1ca9ba32b92 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Mon, 3 Apr 2023 13:46:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/model/contract.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/model/contract.go b/cmd/model/contract.go index c39d1e9..42c7f6c 100644 --- a/cmd/model/contract.go +++ b/cmd/model/contract.go @@ -29,4 +29,5 @@ type Contract struct { CreatedAt int32 `gorm:"column:created_at;autoCreateTime"` UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"` DeletedAt soft_delete.DeletedAt + OldMgmtDataId int32 `gorm:"column:old_mgmt_data_id"` //老画家宝中的id }