提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

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)

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"`
 }