From e6d27263fb9a26596f69f8a11754f868dc0becd9 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 13 May 2022 08:57:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 17 +++-------------- models/user_business_struct.go | 1 + 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 87c8b2355..c42e67f1a 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -266,8 +266,7 @@ func QueryMetrics(start int64, end int64) ([]*UserMetrics, int) { func postDeal(userMetricsList []*UserMetrics) { for _, userMetrics := range userMetricsList { - dateTime := time.Unix(userMetrics.CountDate, 0) - userMetrics.DisplayDate = dateTime.Format("2006-01-02") + userMetrics.DisplayDate = userMetrics.DataDate userMetrics.TotalRegistUser = userMetrics.ActivateRegistUser + userMetrics.NotActivateRegistUser userMetrics.TotalNotActivateRegistUser = userMetrics.TotalUser - userMetrics.TotalActivateRegistUser } @@ -312,16 +311,6 @@ func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics { DaysForMonth: 1, TotalRegistUser: userMetrics.ActivateRegistUser + userMetrics.NotActivateRegistUser, } - // monthUserMetrics.DisplayDate = month - // monthUserMetrics.ActivateRegistUser = userMetrics.ActivateRegistUser - // monthUserMetrics.NotActivateRegistUser = userMetrics.NotActivateRegistUser - // monthUserMetrics.TotalUser = userMetrics.TotalUser - // monthUserMetrics.TotalNotActivateRegistUser = userMetrics.TotalUser - userMetrics.TotalActivateRegistUser - // monthUserMetrics.TotalActivateRegistUser = userMetrics.TotalActivateRegistUser - // monthUserMetrics.TotalHasActivityUser = userMetrics.TotalHasActivityUser - // monthUserMetrics.HasActivityUser = userMetrics.HasActivityUser - // monthUserMetrics.DaysForMonth = 1 - // monthUserMetrics.TotalRegistUser = userMetrics.ActivateRegistUser + userMetrics.NotActivateRegistUser monthMap[month] = monthUserMetrics } else { value := monthMap[month] @@ -893,8 +882,8 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time, //insert userMetrics table var useMetrics UserMetrics - metricCountDate := time.Date(startTime.Year(), startTime.Month(), startTime.Day(), 0, 0, 0, 0, currentTimeNow.Location()) - useMetrics.CountDate = metricCountDate.Unix() + useMetrics.CountDate = CountDate.Unix() + useMetrics.DataDate = DataDate statictisSess.Delete(&useMetrics) useMetrics.ActivateRegistUser = getMapKeyStringValue("ActivateRegistUser", userMetrics) diff --git a/models/user_business_struct.go b/models/user_business_struct.go index bad2dfb9f..70f806c78 100644 --- a/models/user_business_struct.go +++ b/models/user_business_struct.go @@ -412,6 +412,7 @@ type UserMetrics struct { TotalNotActivateRegistUser int `xorm:"-"` TotalHasActivityUser int `xorm:"NOT NULL DEFAULT 0"` DisplayDate string `xorm:"-"` + DataDate string `xorm:"NULL"` DaysForMonth int `xorm:"NOT NULL DEFAULT 0"` HasActivityUserJson string `xorm:"text NULL"` }