|
|
@@ -194,7 +194,7 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus |
|
|
|
var newAndCond = builder.NewCond() |
|
|
|
var newOrCond = builder.NewCond() |
|
|
|
for _, userRecord := range userBusinessAnalysisList { |
|
|
|
newOrCond.Or( |
|
|
|
newOrCond = newOrCond.Or( |
|
|
|
builder.Eq{"id": userRecord.ID}, |
|
|
|
) |
|
|
|
} |
|
|
@@ -267,7 +267,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time, |
|
|
|
end_unix := endTime.Unix() |
|
|
|
CountDate := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 0, 1, 0, 0, currentTimeNow.Location()) |
|
|
|
if isReCount { |
|
|
|
CountDate = time.Date(startTime.Year(), startTime.Month(), startTime.Day(), 0, 1, 0, 0, startTime.Location()) |
|
|
|
CountDate = time.Date(startTime.Year(), startTime.Month(), startTime.Day(), 0, 1, 0, 0, currentTimeNow.Location()) |
|
|
|
} |
|
|
|
|
|
|
|
DataDate := startTime.Format("2006-01-02") |
|
|
|