修改任务排行
This commit is contained in:
@ -98,7 +98,7 @@ func (s *sTask) UserTaskRankingList(ctx context.Context, in *model.UserTaskRanki
|
|||||||
var loginUserRanking []model.LoginUserRanking
|
var loginUserRanking []model.LoginUserRanking
|
||||||
var loginUserRankingNum model.LoginUserRankingNum
|
var loginUserRankingNum model.LoginUserRankingNum
|
||||||
if in.OperatorId != 0 {
|
if in.OperatorId != 0 {
|
||||||
value, err := dao.UserTasks.Ctx(ctx).Fields("count(*) num").Where(dao.UserTasks.Columns().UserId, in.OperatorId).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, in.StoreId).Where(dao.UserTasks.Columns().Status, 2).
|
||||||
WhereBetween(dao.UserTasks.Columns().CompletedAt, start, end).Group("user_id").
|
WhereBetween(dao.UserTasks.Columns().CompletedAt, start, end).Group("user_id").
|
||||||
Value()
|
Value()
|
||||||
|
|
||||||
@ -113,7 +113,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())).
|
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().Status, 2).
|
Fields("username,count(*) num").Where(dao.UserTasks.Columns().StoreId, in.StoreId).Where(dao.UserTasks.Columns().Status, 2).
|
||||||
WhereBetween(dao.UserTasks.Columns().CompletedAt, start, end).OrderDesc("num").OrderDesc("username").Group("user_id").
|
WhereBetween(dao.UserTasks.Columns().CompletedAt, start, end).OrderDesc("num").OrderDesc("username").Group("user_id").
|
||||||
Scan(&loginUserRanking)
|
Scan(&loginUserRanking)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user