From 37dbffd2a04ed1ab784ed05edd528901318eab58 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 29 Sep 2021 17:18:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=90=E8=90=A5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index daaccd8d8..0bbb05c55 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -57,6 +57,9 @@ type UserBusinessAnalysis struct { //user Email string `xorm:"NOT NULL"` + + //user + Name string `xorm:"NOT NULL"` } func countData() { @@ -92,6 +95,7 @@ func countData() { dateRecord.CountDate = CountDate.Unix() dateRecord.Email = userRecord.Email dateRecord.RegistDate = userRecord.CreatedUnix + dateRecord.Name = userRecord.Name if _, ok := CodeMergeCountMap[dateRecord.ID]; !ok { dateRecord.CodeMergeCount = 0 @@ -119,11 +123,11 @@ func countData() { func queryAction(start_unix int64, end_unix int64, actionType int64) map[int64]int { sess := x.NewSession() defer sess.Close() - sess.Select("id,user_id,op_type,act_user_id").Table("action").Where("op_type=" + fmt.Sprint(actionType) + " and create_unix>=" + fmt.Sprint(start_unix) + " and create_unix<=" + fmt.Sprint(end_unix)) + sess.Select("id,user_id,op_type,act_user_id").Table("action").Where("op_type=" + fmt.Sprint(actionType) + " and created_unix>=" + fmt.Sprint(start_unix) + " and created_unix<=" + fmt.Sprint(end_unix)) actionList := make([]*Action, 0) sess.Find(&actionList) resultMap := make(map[int64]int) - + log.Info("query action size=" + fmt.Sprint(len(actionList))) for _, actionRecord := range actionList { if _, ok := resultMap[actionRecord.UserID]; !ok { resultMap[actionRecord.UserID] = 1