diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index ac49434d8..24cab2de9 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -248,12 +248,8 @@ func QueryMetricsPage(start int64, end int64, page int, pageSize int) ([]UserMet Find(&userMetricsList); err != nil { return nil, 0 } - for _, userMetrics := range userMetricsList { - dateTime := time.Unix(userMetrics.CountDate, 0) - userMetrics.DisplayDate = dateTime.Format("2006-01-02") - } + postDeal(userMetricsList) return userMetricsList, allCount - } func QueryMetrics(start int64, end int64) ([]UserMetrics, int) { @@ -264,11 +260,16 @@ func QueryMetrics(start int64, end int64) ([]UserMetrics, int) { Find(&userMetricsList); err != nil { return nil, 0 } + postDeal(userMetricsList) + return userMetricsList, len(userMetricsList) +} + +func postDeal(userMetricsList []UserMetrics) { for _, userMetrics := range userMetricsList { dateTime := time.Unix(userMetrics.CountDate, 0) userMetrics.DisplayDate = dateTime.Format("2006-01-02") + userMetrics.TotalRegistUser = userMetrics.ActivateRegistUser + userMetrics.NotActivateRegistUser } - return userMetricsList, len(userMetricsList) } func QueryMetricsForAll() []UserMetrics { @@ -307,6 +308,7 @@ func makeResultForMonth(allUserInfo []UserMetrics, count int) []UserMetrics { monthUserMetrics.TotalHasActivityUser = userMetrics.TotalHasActivityUser monthUserMetrics.HasActivityUser = userMetrics.HasActivityUser monthUserMetrics.DaysForMonth = 1 + monthUserMetrics.TotalRegistUser = userMetrics.ActivateRegistUser + userMetrics.NotActivateRegistUser monthMap[month] = monthUserMetrics } else { value := monthMap[month] @@ -316,6 +318,7 @@ func makeResultForMonth(allUserInfo []UserMetrics, count int) []UserMetrics { value.TotalActivateRegistUser += userMetrics.TotalActivateRegistUser value.TotalHasActivityUser += userMetrics.TotalHasActivityUser value.HasActivityUser += userMetrics.HasActivityUser + value.TotalRegistUser += userMetrics.TotalRegistUser value.DaysForMonth += 1 } } diff --git a/models/user_business_struct.go b/models/user_business_struct.go index ad4ff0bdb..05d970eb7 100644 --- a/models/user_business_struct.go +++ b/models/user_business_struct.go @@ -407,6 +407,7 @@ type UserMetrics struct { RegistActivityUser int `xorm:"NOT NULL DEFAULT 0"` HasActivityUser int `xorm:"NOT NULL DEFAULT 0"` TotalUser int `xorm:"NOT NULL DEFAULT 0"` + TotalRegistUser int `xorm:"-"` TotalActivateRegistUser int `xorm:"NOT NULL DEFAULT 0"` TotalHasActivityUser int `xorm:"NOT NULL DEFAULT 0"` DisplayDate string `xorm:"-"`