|
|
@@ -90,15 +90,7 @@ type UserBusinessAnalysisList []*UserBusinessAnalysis |
|
|
|
func (ulist UserBusinessAnalysisList) Swap(i, j int) { ulist[i], ulist[j] = ulist[j], ulist[i] } |
|
|
|
func (ulist UserBusinessAnalysisList) Len() int { return len(ulist) } |
|
|
|
func (ulist UserBusinessAnalysisList) Less(i, j int) bool { |
|
|
|
if ulist[i].CommitCount > ulist[j].CommitCount { |
|
|
|
return true |
|
|
|
} else { |
|
|
|
if ulist[i].CommitCount == ulist[j].CommitCount { |
|
|
|
return ulist[i].ID > ulist[j].ID |
|
|
|
} else { |
|
|
|
return false |
|
|
|
} |
|
|
|
} |
|
|
|
return ulist[i].ID > ulist[j].ID |
|
|
|
} |
|
|
|
|
|
|
|
func QueryUserStaticData(startTime int64, endTime int64) []*UserBusinessAnalysis { |
|
|
@@ -201,7 +193,7 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus |
|
|
|
} |
|
|
|
|
|
|
|
userBusinessAnalysisList := make([]*UserBusinessAnalysis, 0) |
|
|
|
if err := statictisSess.Table("user_business_analysis").Where(cond).OrderBy("count_date desc"). |
|
|
|
if err := statictisSess.Table("user_business_analysis").Where(cond).OrderBy("id desc"). |
|
|
|
Find(&userBusinessAnalysisList); err != nil { |
|
|
|
return nil, 0 |
|
|
|
} |
|
|
|