From 235fab09406d99fdd4a362eae7fd08e1bafe78af Mon Sep 17 00:00:00 2001 From: Robin <7434053+warrior_of_light_robin@user.noreply.gitee.com> Date: Thu, 21 Nov 2024 14:44:44 +0800 Subject: [PATCH 1/2] 1 --- app/mix/service/utilservice.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mix/service/utilservice.go b/app/mix/service/utilservice.go index 2c816907..4c1c775f 100644 --- a/app/mix/service/utilservice.go +++ b/app/mix/service/utilservice.go @@ -276,7 +276,7 @@ func (s *Service) utilFillMomentsWithApiVOInfo(ctx *gin.Context, list []*dbstruc return } - // 4.获取审核信息 + // 4.获取审核信息1 tasks, err := _DefaultMomentAuditTask.GetByMomentIds(ctx, momentIds) if err != nil { logger.Error("GetByMomentIds fail") -- 2.41.0 From 660d6361417eba0391ad71c1cffad0fe8d818200 Mon Sep 17 00:00:00 2001 From: Robin <7434053+warrior_of_light_robin@user.noreply.gitee.com> Date: Thu, 21 Nov 2024 14:47:44 +0800 Subject: [PATCH 2/2] 1 --- api/proto/moment/proto/moment_op.go | 6 +++--- app/mix/service/apiservice.go | 2 +- app/mix/service/service.go | 2 +- app/mix/service/utilservice.go | 4 ++-- dbstruct/moment_audit_task.go | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/proto/moment/proto/moment_op.go b/api/proto/moment/proto/moment_op.go index 55d1ea2f..f00cf956 100644 --- a/api/proto/moment/proto/moment_op.go +++ b/api/proto/moment/proto/moment_op.go @@ -145,9 +145,9 @@ type OpListByIdsResp struct { // op 复审 type OpReviewReq struct { base.BaseRequest - MomentIds []int64 `json:"moment_ids"` - OpType int64 `json:"op_type"` - Remarks string `json:"remarks"` + MomentIds []int64 `json:"moment_ids"` + OpType int64 `json:"op_type"` + ManuallyReviewOpinion string `json:"manually_review_opinion"` } type OpReviewData struct { diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index a1b76e52..75770958 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -2285,7 +2285,7 @@ func (s *Service) ApiUpdateMoment(ctx *gin.Context, req *momentproto.ApiUpdateRe Id: tasks[0].Id, ManuallyReviewStatus: goproto.Int64(consts.MomentManuallyReview_Waiting), ManuallyReviewOperator: goproto.Int64(0), - Remarks: goproto.String(""), + ManuallyReviewOpinion: goproto.String(""), } if len(imageaudittasks) > 0 { diff --git a/app/mix/service/service.go b/app/mix/service/service.go index 942db12c..ec9c1c75 100644 --- a/app/mix/service/service.go +++ b/app/mix/service/service.go @@ -1504,7 +1504,7 @@ func (s *Service) OpReviewMoment(ctx *gin.Context, req *momentproto.OpReviewReq) err = _DefaultMomentAuditTask.OpUpdateByMomentIdsAndStatus(ctx, &dbstruct.MomentAuditTask{ ManuallyReviewStatus: goproto.Int64(finalMomentAuditTaskStatus), ManuallyReviewOperator: goproto.Int64(req.BaseRequest.Mid), - Remarks: goproto.String(req.Remarks), + ManuallyReviewOpinion: goproto.String(req.ManuallyReviewOpinion), }, momentStrIds, consts.MomentManuallyReview_Waiting) if err != nil { logger.Error("_DefaultMomentAuditTask OpUpdateByMomentIdsAndStatus fail, req: %v, err: %v", util.ToJson(req), err) diff --git a/app/mix/service/utilservice.go b/app/mix/service/utilservice.go index 4c1c775f..e4b3a8b3 100644 --- a/app/mix/service/utilservice.go +++ b/app/mix/service/utilservice.go @@ -305,7 +305,7 @@ func (s *Service) utilFillMomentsWithApiVOInfo(ctx *gin.Context, list []*dbstruc // 填充审核信息 vo.ImageAuditOpinion = taskMp[fmt.Sprint(vo.Moment.GetId())].GetImageAuditOpinion() 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.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 diff --git a/dbstruct/moment_audit_task.go b/dbstruct/moment_audit_task.go index 2d711674..e7c7c8ae 100644 --- a/dbstruct/moment_audit_task.go +++ b/dbstruct/moment_audit_task.go @@ -16,7 +16,7 @@ type MomentAuditTask struct { Status *int64 `json:"status" bson:"status"` // 是否已过期 ManuallyReviewStatus *int64 `json:"manually_review_status" bson:"manually_review_status"` // 人工复审状态 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"` // 创建时间 Ut *int64 `json:"ut" bson:"ut"` // 更新时间 DelFlag *int64 `json:"del_flag" bson:"del_flag"` // 删除标记 @@ -65,9 +65,9 @@ func (p *MomentAuditTask) GetTextAuditOpinion() string { return *p.TextAuditOpinion } -func (p *MomentAuditTask) GetRemarks() string { - if p == nil || p.Remarks == nil { +func (p *MomentAuditTask) GetManuallyReviewOpinion() string { + if p == nil || p.ManuallyReviewOpinion == nil { return "" } - return *p.Remarks + return *p.ManuallyReviewOpinion } -- 2.41.0