Browse Source

提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>
pull/1036/head
zouap 3 years ago
parent
commit
a8205877ed
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      models/user_business_analysis.go

+ 2
- 4
models/user_business_analysis.go View File

@@ -199,10 +199,9 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus
} }
statictisSess.Limit(opts.PageSize, start) statictisSess.Limit(opts.PageSize, start)
} }
statictisSess.OrderBy("count_date desc, commit_count desc")


userBusinessAnalysisList := make([]*UserBusinessAnalysis, 0) userBusinessAnalysisList := make([]*UserBusinessAnalysis, 0)
if err := statictisSess.Table("user_business_analysis").Where(cond).
if err := statictisSess.Table("user_business_analysis").Where(cond).OrderBy("count_date desc").
Find(&userBusinessAnalysisList); err != nil { Find(&userBusinessAnalysisList); err != nil {
return nil, 0 return nil, 0
} }
@@ -228,9 +227,8 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus
builder.Lte{"count_date": opts.EndTime}, builder.Lte{"count_date": opts.EndTime},
) )
} }

userBusinessAnalysisList = make([]*UserBusinessAnalysis, 0) userBusinessAnalysisList = make([]*UserBusinessAnalysis, 0)
if err := statictisSess.Table("user_business_analysis").Where(newAndCond).
if err := statictisSess.Table("user_business_analysis").Where(newAndCond).OrderBy("count_date desc").
Find(&userBusinessAnalysisList); err != nil { Find(&userBusinessAnalysisList); err != nil {
return nil, 0 return nil, 0
} }


Loading…
Cancel
Save