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

Merge remote-tracking branch 'origin/feature-streamer_nick_audit-wxy-20241209' into test

This commit is contained in:
wangxinyu 2024-12-24 15:39:29 +08:00
parent 2648cc5cfe 47fbda1240
commit d4cc723c34
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/proto/textaudittask/proto/textaudittask_op.go
View File

@ -57,6 +57,7 @@ type OpListReq struct {
AssociativeTableColumn *string `json:"associative_table_column"`
BatchId *string `json:"batch_id"`
Status *int64 `json:"status"`
Role *int64 `json:"role"`
Offset int `json:"offset"`
Limit int `json:"limit"`
Sort string

9
app/mix/dao/mongo.go
View File

@ -4043,6 +4043,9 @@ func (m *Mongo) GetTextAuditTaskList(ctx *gin.Context, req *textaudittaskproto.O
if req.Status != nil {
query["status"] = util.DerefInt64(req.Status)
}
if req.Role != nil {
query["role"] = util.DerefInt64(req.Role)
}
if req.NotAlignedOpt != 0 {
query["is_aligned"] = qmgo.M{
"$ne": consts.TextAuditIsAligned_Yes,
@ -4060,7 +4063,7 @@ func (m *Mongo) GetTextAuditTaskList(ctx *gin.Context, req *textaudittaskproto.O
return list, err
}
func (m *Mongo) GetTextAuditTaskListByCollectionInfos(ctx *gin.Context, databases []string, tableNames []string, status int64, offset, limit int) ([]*dbstruct.TextAuditTask, error) {
func (m *Mongo) GetTextAuditTaskListByCollectionInfos(ctx *gin.Context, databases []string, tableNames []string, status int64, role *int64, offset, limit int) ([]*dbstruct.TextAuditTask, error) {
list := make([]*dbstruct.TextAuditTask, 0)
if len(databases) != len(tableNames) {
@ -4076,6 +4079,10 @@ func (m *Mongo) GetTextAuditTaskListByCollectionInfos(ctx *gin.Context, database
"del_flag": 0,
}
if role != nil {
query["role"] = util.DerefInt64(role)
}
orClause := make([]qmgo.M, 0)
for i := range databases {
orClause = append(orClause, qmgo.M{

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

@ -87,7 +87,7 @@ func (p *TextAuditTaskDecorator) OpList(ctx *gin.Context, req *textaudittaskprot
databases = append(databases, collectionInfo.Database)
tableNames = append(tableNames, collectionInfo.TableName)
}
return p.TextAuditTask.OpListByCollectionInfos(ctx, databases, tableNames, util.DerefInt64(req.Status), req.Offset, req.Limit)
return p.TextAuditTask.OpListByCollectionInfos(ctx, databases, tableNames, util.DerefInt64(req.Status), req.Role, req.Offset, req.Limit)
}
}
return queryFunc(ctx, req)

4
app/mix/service/logic/textaudittask.go
View File

@ -65,8 +65,8 @@ func (p *TextAuditTask) OpList(ctx *gin.Context, req *textaudittaskproto.OpListR
return list, nil
}
func (p *TextAuditTask) OpListByCollectionInfos(ctx *gin.Context, databases []string, tableNames []string, status int64, offset, limit int) ([]*dbstruct.TextAuditTask, error) {
list, err := p.store.GetTextAuditTaskListByCollectionInfos(ctx, databases, tableNames, status, offset, limit)
func (p *TextAuditTask) OpListByCollectionInfos(ctx *gin.Context, databases []string, tableNames []string, status int64, role *int64, offset, limit int) ([]*dbstruct.TextAuditTask, error) {
list, err := p.store.GetTextAuditTaskListByCollectionInfos(ctx, databases, tableNames, status, role, offset, limit)
if err != nil {
logger.Error("GetTextAuditTaskListByCollectionInfos fail, err: %v", err)
return make([]*dbstruct.TextAuditTask, 0), err