| @@ -39,6 +39,7 @@ func QueryUserStaticDataPage(ctx *context.Context) { | |||||
| endTime = time.Now() | endTime = time.Now() | ||||
| } else { | } else { | ||||
| startTime, _ = time.ParseInLocation("2006-01-02", startDate, time.Local) | startTime, _ = time.ParseInLocation("2006-01-02", startDate, time.Local) | ||||
| startTime = time.Date(startTime.Year(), startTime.Month(), startTime.Day(), 12, 0, 0, 0, startTime.Location()) | |||||
| settingStartTime, _ := time.Parse("2006-01-02", setting.RadarMap.RecordBeginTime) | settingStartTime, _ := time.Parse("2006-01-02", setting.RadarMap.RecordBeginTime) | ||||
| if startTime.Unix() < settingStartTime.Unix() { | if startTime.Unix() < settingStartTime.Unix() { | ||||
| startTime = settingStartTime | startTime = settingStartTime | ||||
| @@ -46,10 +47,8 @@ func QueryUserStaticDataPage(ctx *context.Context) { | |||||
| } | } | ||||
| endTime, _ = time.ParseInLocation("2006-01-02", endDate, time.Local) | endTime, _ = time.ParseInLocation("2006-01-02", endDate, time.Local) | ||||
| endTime = endTime.AddDate(0, 0, 1) | endTime = endTime.AddDate(0, 0, 1) | ||||
| if startDate == endDate { | |||||
| startTime = startTime.AddDate(0, 0, 1) | |||||
| endTime = endTime.AddDate(0, 0, 1) | |||||
| } | |||||
| endTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 23, 59, 59, 0, startTime.Location()) | |||||
| isAll = false | isAll = false | ||||
| log.Info("startTime=" + fmt.Sprint(startTime.Unix()) + " endDate=" + fmt.Sprint(endTime.Unix())) | log.Info("startTime=" + fmt.Sprint(startTime.Unix()) + " endDate=" + fmt.Sprint(endTime.Unix())) | ||||
| } | } | ||||