|
|
@@ -243,10 +243,15 @@ func QueryMetricsPage(start int64, end int64, page int, pageSize int) ([]UserMet |
|
|
|
return nil, 0 |
|
|
|
} |
|
|
|
userMetricsList := make([]UserMetrics, 0) |
|
|
|
if err := statictisSess.Table(new(UserMetrics)).Where(cond).Limit(pageSize, page*pageSize).OrderBy("count_date desc"). |
|
|
|
//.Limit(pageSize, page*pageSize) |
|
|
|
if err := statictisSess.Table(new(UserMetrics)).Where(cond).OrderBy("count_date desc"). |
|
|
|
Find(&userMetricsList); err != nil { |
|
|
|
return nil, 0 |
|
|
|
} |
|
|
|
for _, userMetrics := range userMetricsList { |
|
|
|
dateTime := time.Unix(userMetrics.CountDate, 0) |
|
|
|
userMetrics.DisplayDate = dateTime.Format("2006-01-02") |
|
|
|
} |
|
|
|
return userMetricsList, allCount |
|
|
|
|
|
|
|
} |
|
|
|