|
|
@@ -74,7 +74,7 @@ type UserBusinessAnalysis struct { |
|
|
|
//user |
|
|
|
Name string `xorm:"NOT NULL"` |
|
|
|
|
|
|
|
DataDate string `xorm:"NULL"` |
|
|
|
DataDate string `xorm:"NOT NULL"` |
|
|
|
} |
|
|
|
|
|
|
|
type UserBusinessAnalysisQueryOptions struct { |
|
|
@@ -264,7 +264,7 @@ func CounDataByDate(wikiCountMap map[string]int, startTime time.Time, endTime ti |
|
|
|
//endTime := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 0, 0, 0, 0, currentTimeNow.Location()) |
|
|
|
end_unix := endTime.Unix() |
|
|
|
|
|
|
|
CountDate := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 0, 1, 0, 0, currentTimeNow.Location()) |
|
|
|
CountDate := time.Date(startTime.Year(), startTime.Month(), startTime.Day(), 0, 1, 0, 0, startTime.Location()) |
|
|
|
DataDate := startTime.Format("2006-01-02") |
|
|
|
CodeMergeCountMap := queryPullRequest(start_unix, end_unix) |
|
|
|
CommitCountMap := queryAction(start_unix, end_unix, 5) |
|
|
|