Merge branch 'dev-lzh' into dev

This commit is contained in:
lzh 2025-06-17 16:09:46 +08:00
commit fc396fd909

View File

@ -246,6 +246,12 @@ func GetVedioWorkDetail(req *bundle.GetVedioWorkDetailReq) (data model.CastWorkV
} }
func ToBeComfirmedWorks(req *bundle.ToBeComfirmedWorksReq) (data []model.CastWorkLog, total int64, unconfirmed int64, err error) { func ToBeComfirmedWorks(req *bundle.ToBeComfirmedWorksReq) (data []model.CastWorkLog, total int64, unconfirmed int64, err error) {
err = app.ModuleClients.BundleDB.Model(&model.CastWorkLog{}).Where(&model.CastWorkLog{
ArtistUuid: req.ArtistUuid,
}).Where("confirmed_at = ?", 0).Count(&unconfirmed).Error
if err != nil {
return
}
session := app.ModuleClients.BundleDB.Model(&model.CastWorkLog{}).Where(&model.CastWorkLog{ session := app.ModuleClients.BundleDB.Model(&model.CastWorkLog{}).Where(&model.CastWorkLog{
ArtistUuid: req.ArtistUuid, ArtistUuid: req.ArtistUuid,
}) })
@ -253,10 +259,6 @@ func ToBeComfirmedWorks(req *bundle.ToBeComfirmedWorksReq) (data []model.CastWor
if err != nil { if err != nil {
return return
} }
err = session.Where("confirmed_at = ?", 0).Count(&unconfirmed).Error
if err != nil {
return
}
if req.Page != 0 && req.PageSize != 0 { if req.Page != 0 && req.PageSize != 0 {
session.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize)) session.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize))
} }