提交代码。

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

models/user_business_analysis.go

@@ -300,17 +300,28 @@ func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics {
 			dateTime := time.Unix(userMetrics.CountDate, 0)
 			month := fmt.Sprint(dateTime.Year()) + "-" + fmt.Sprint(int(dateTime.Month()))
 			if _, ok := monthMap[month]; !ok {
-				var monthUserMetrics *UserMetrics
-				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
+				monthUserMetrics := &UserMetrics{
+					DisplayDate:                month,
+					ActivateRegistUser:         userMetrics.ActivateRegistUser,
+					NotActivateRegistUser:      userMetrics.NotActivateRegistUser,
+					TotalUser:                  userMetrics.TotalUser,
+					TotalNotActivateRegistUser: userMetrics.TotalUser - userMetrics.TotalActivateRegistUser,
+					TotalActivateRegistUser:    userMetrics.TotalActivateRegistUser,
+					TotalHasActivityUser:       userMetrics.TotalHasActivityUser,
+					HasActivityUser:            userMetrics.HasActivityUser,
+					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]