wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUG-20241119 #818

Merged
chenhao merged 2 commits from BUG-20241119 into test 2024-11-21 14:48:14 +08:00
Conversation 0 Commits 2 Files Changed 5 +12 -12
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/proto/moment/proto/moment_op.go
View File

@ -145,9 +145,9 @@ type OpListByIdsResp struct {
// op 复审 // op 复审
type OpReviewReq struct { type OpReviewReq struct {
base.BaseRequest base.BaseRequest
MomentIds []int64 `json:"moment_ids"` MomentIds []int64 `json:"moment_ids"`
OpType int64 `json:"op_type"` OpType int64 `json:"op_type"`
Remarks string `json:"remarks"` ManuallyReviewOpinion string `json:"manually_review_opinion"`
} }
type OpReviewData struct { type OpReviewData struct {

2
app/mix/service/apiservice.go
View File

@ -2285,7 +2285,7 @@ func (s *Service) ApiUpdateMoment(ctx *gin.Context, req *momentproto.ApiUpdateRe
Id: tasks[0].Id, Id: tasks[0].Id,
ManuallyReviewStatus: goproto.Int64(consts.MomentManuallyReview_Waiting), ManuallyReviewStatus: goproto.Int64(consts.MomentManuallyReview_Waiting),
ManuallyReviewOperator: goproto.Int64(0), ManuallyReviewOperator: goproto.Int64(0),
Remarks: goproto.String(""), ManuallyReviewOpinion: goproto.String(""),
} }
if len(imageaudittasks) > 0 { if len(imageaudittasks) > 0 {

2
app/mix/service/service.go
View File

@ -1504,7 +1504,7 @@ func (s *Service) OpReviewMoment(ctx *gin.Context, req *momentproto.OpReviewReq)
err = _DefaultMomentAuditTask.OpUpdateByMomentIdsAndStatus(ctx, &dbstruct.MomentAuditTask{ err = _DefaultMomentAuditTask.OpUpdateByMomentIdsAndStatus(ctx, &dbstruct.MomentAuditTask{
ManuallyReviewStatus: goproto.Int64(finalMomentAuditTaskStatus), ManuallyReviewStatus: goproto.Int64(finalMomentAuditTaskStatus),
ManuallyReviewOperator: goproto.Int64(req.BaseRequest.Mid), ManuallyReviewOperator: goproto.Int64(req.BaseRequest.Mid),
Remarks: goproto.String(req.Remarks), ManuallyReviewOpinion: goproto.String(req.ManuallyReviewOpinion),
}, momentStrIds, consts.MomentManuallyReview_Waiting) }, momentStrIds, consts.MomentManuallyReview_Waiting)
if err != nil { if err != nil {
logger.Error("_DefaultMomentAuditTask OpUpdateByMomentIdsAndStatus fail, req: %v, err: %v", util.ToJson(req), err) logger.Error("_DefaultMomentAuditTask OpUpdateByMomentIdsAndStatus fail, req: %v, err: %v", util.ToJson(req), err)

6
app/mix/service/utilservice.go
View File

@ -276,7 +276,7 @@ func (s *Service) utilFillMomentsWithApiVOInfo(ctx *gin.Context, list []*dbstruc
return return
} }
// 4.获取审核信息 // 4.获取审核信息1
tasks, err := _DefaultMomentAuditTask.GetByMomentIds(ctx, momentIds) tasks, err := _DefaultMomentAuditTask.GetByMomentIds(ctx, momentIds)
if err != nil { if err != nil {
logger.Error("GetByMomentIds fail") logger.Error("GetByMomentIds fail")
@ -305,7 +305,7 @@ func (s *Service) utilFillMomentsWithApiVOInfo(ctx *gin.Context, list []*dbstruc
// 填充审核信息 // 填充审核信息
vo.ImageAuditOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetImageAuditOpinion() vo.ImageAuditOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetImageAuditOpinion()
vo.TextAuditOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetTextAuditOpinion() vo.TextAuditOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetTextAuditOpinion()
vo.ManuallyReviewOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetRemarks() vo.ManuallyReviewOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetManuallyReviewOpinion()
} }
@ -358,7 +358,7 @@ func (s *Service) utilFillMomentsWithOpVOInfo(ctx *gin.Context, list []*dbstruct
// 填充审核信息 // 填充审核信息
vo.ImageAuditOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetImageAuditOpinion() vo.ImageAuditOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetImageAuditOpinion()
vo.TextAuditOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetTextAuditOpinion() vo.TextAuditOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetTextAuditOpinion()
vo.ManuallyReviewOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetRemarks() vo.ManuallyReviewOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetManuallyReviewOpinion()
} }
return return

8
dbstruct/moment_audit_task.go
View File

@ -16,7 +16,7 @@ type MomentAuditTask struct {
Status *int64 `json:"status" bson:"status"` // 是否已过期 Status *int64 `json:"status" bson:"status"` // 是否已过期
ManuallyReviewStatus *int64 `json:"manually_review_status" bson:"manually_review_status"` // 人工复审状态 ManuallyReviewStatus *int64 `json:"manually_review_status" bson:"manually_review_status"` // 人工复审状态
ManuallyReviewOperator *int64 `json:"manually_review_operator" bson:"manually_review_operator"` // 人工复审操作人 ManuallyReviewOperator *int64 `json:"manually_review_operator" bson:"manually_review_operator"` // 人工复审操作人
Remarks *string `json:"remarks" bson:"remarks"` // 备注 ManuallyReviewOpinion *string `json:"manually_review_opinion" bson:"manually_review_opinion"` // 备注
Ct *int64 `json:"ct" bson:"ct"` // 创建时间 Ct *int64 `json:"ct" bson:"ct"` // 创建时间
Ut *int64 `json:"ut" bson:"ut"` // 更新时间 Ut *int64 `json:"ut" bson:"ut"` // 更新时间
DelFlag *int64 `json:"del_flag" bson:"del_flag"` // 删除标记 DelFlag *int64 `json:"del_flag" bson:"del_flag"` // 删除标记
@ -65,9 +65,9 @@ func (p *MomentAuditTask) GetTextAuditOpinion() string {
return *p.TextAuditOpinion return *p.TextAuditOpinion
} }
func (p *MomentAuditTask) GetRemarks() string { func (p *MomentAuditTask) GetManuallyReviewOpinion() string {
if p == nil || p.Remarks == nil { if p == nil || p.ManuallyReviewOpinion == nil {
return "" return ""
} }
return *p.Remarks return *p.ManuallyReviewOpinion
} }