Browse Source

Merge pull request '增加用户运营统计数据分页记录数可设置,及用户名称可以模糊搜索' (#832) from zouap_static into V20211115

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/832
Reviewed-by: lewis <747342561@qq.com>
pull/833/head
lewis 3 years ago
parent
commit
163afe95a6
2 changed files with 6 additions and 2 deletions
  1. +1
    -1
      models/user_business_analysis.go
  2. +5
    -1
      routers/repo/user_data_analysis.go

+ 1
- 1
models/user_business_analysis.go View File

@@ -154,7 +154,7 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus
var cond = builder.NewCond()
if len(opts.UserName) > 0 {
cond = cond.And(
builder.Eq{"name": opts.UserName},
builder.Like{"name", opts.UserName},
)
}
cond = cond.And(


+ 5
- 1
routers/repo/user_data_analysis.go View File

@@ -29,6 +29,10 @@ func QueryUserStaticDataPage(ctx *context.Context) {
if page <= 0 {
page = 1
}
pageSize := ctx.QueryInt("pageSize")
if pageSize <= 0 {
pageSize = setting.UI.IssuePagingNum
}
userName := ctx.Query("userName")

log.Info("startDate=" + startDate + " endDate=" + endDate + " userName=" + userName + " page=" + fmt.Sprint(page))
@@ -39,7 +43,7 @@ func QueryUserStaticDataPage(ctx *context.Context) {
pageOpts := &models.UserBusinessAnalysisQueryOptions{
ListOptions: models.ListOptions{
Page: page,
PageSize: setting.UI.IssuePagingNum,
PageSize: pageSize,
},
UserName: userName,
StartTime: startTime.Unix(),


Loading…
Cancel
Save