修改PC排行榜
This commit is contained in:
@ -100,7 +100,7 @@ func (s *sTask) UserTaskRankingList(ctx context.Context, in *model.UserTaskRanki
|
||||
var total int
|
||||
// SELECT `uid`,`nickname` FROM `user` ORDER BY `uid` asc
|
||||
err = m.Page(in.Page, in.Size).LeftJoin(dao.Users.Table(), fmt.Sprintf("`%s`.`id` = `%s`.`user_id`", dao.Users.Table(), dao.UserTasks.Table())).
|
||||
Fields("username,avatar,count(*) num").Where(dao.UserTasks.Columns().Status, 2).
|
||||
Fields("username,avatar,count(*) num").Where(dao.UserTasks.Columns().Status, 2).WhereOr(dao.UserTasks.Columns().Status, 3).
|
||||
WhereBetween(dao.UserTasks.Columns().CompletedAt, start, end).OrderDesc("num").OrderDesc("username").Group("user_id").
|
||||
ScanAndCount(&list, &total, false)
|
||||
if err != nil {
|
||||
@ -112,7 +112,8 @@ func (s *sTask) UserTaskRankingList(ctx context.Context, in *model.UserTaskRanki
|
||||
var loginUserRanking []model.LoginUserRanking
|
||||
var loginUserRankingNum model.LoginUserRankingNum
|
||||
if in.OperatorId != 0 {
|
||||
value, err := dao.UserTasks.Ctx(ctx).Fields("count(*) num").Where(dao.UserTasks.Columns().UserId, in.OperatorId).Where(dao.UserTasks.Columns().StoreId, storeId).Where(dao.UserTasks.Columns().Status, 2).
|
||||
value, err := dao.UserTasks.Ctx(ctx).Fields("count(*) num").Where(dao.UserTasks.Columns().UserId, in.OperatorId).Where(dao.UserTasks.Columns().StoreId, storeId).
|
||||
Where(dao.UserTasks.Columns().Status, 2).WhereOr(dao.UserTasks.Columns().Status, 3).
|
||||
WhereBetween(dao.UserTasks.Columns().CompletedAt, start, end).Group("user_id").
|
||||
Value()
|
||||
|
||||
@ -128,6 +129,7 @@ func (s *sTask) UserTaskRankingList(ctx context.Context, in *model.UserTaskRanki
|
||||
|
||||
err = dao.UserTasks.Ctx(ctx).LeftJoin(dao.Users.Table(), fmt.Sprintf("`%s`.`id` = `%s`.`user_id`", dao.Users.Table(), dao.UserTasks.Table())).
|
||||
Fields("username,count(*) num").Where(dao.UserTasks.Columns().StoreId, storeId).Where(dao.UserTasks.Columns().Status, 2).
|
||||
WhereOr(dao.UserTasks.Columns().Status, 3).
|
||||
WhereBetween(dao.UserTasks.Columns().CompletedAt, start, end).OrderDesc("num").OrderDesc("username").Group("user_id").
|
||||
Scan(&loginUserRanking)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user