|
|
@@ -3374,19 +3374,17 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
if dateTime.Month() == 2 && dateTime.Day() == 29 {
|
|
|
continue
|
|
|
}
|
|
|
-
|
|
|
+ newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
|
|
|
if seasonConfig.JumpYear == 1 {
|
|
|
if startDate.After(endDate) {
|
|
|
// 如果跨年且不到一年
|
|
|
// 全年截取一部分
|
|
|
- newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
|
|
|
-
|
|
|
if newDate.Before(startDate.AddDate(0, 0, 1)) && newDate.After(endDate) {
|
|
|
continue
|
|
|
}
|
|
|
if newDate.After(startDate.AddDate(0, 0, -1)) {
|
|
|
// 减一年
|
|
|
- newDate = newDate.AddDate(-1, 0, 0)
|
|
|
+ newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year() - 1, 0, 0)
|
|
|
}
|
|
|
// 处理上下限列表
|
|
|
if value, ok := maxValueMap[newDate]; ok {
|
|
|
@@ -3409,7 +3407,6 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
} else {
|
|
|
// 如果跨年且大于等于一年
|
|
|
// double后截取
|
|
|
- newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
|
|
|
if newDate.After(startDate) {
|
|
|
// 处理上下限列表
|
|
|
if value, ok := maxValueMap[newDate]; ok {
|
zwxi