Merge branch 'ETA_1.9.4' into debug

services/data/chart_info.go

@@ -3863,27 +3863,27 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						}
 						var newDate time.Time
 						if seasonConfig.JumpYear == 1 {
-							newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year() - 1, 0, 0)
-							// 处理上下限列表
-							if value, ok := maxValueMap[newDate]; ok {
-								if value < handleDataMap[date] {
-									maxValueMap[newDate] = handleDataMap[date]
-								}
-							} else {
-								maxValueMap[newDate] = handleDataMap[date]
-							}
-
-							if value, ok := minValueMap[newDate]; ok {
-								if value > handleDataMap[date] {
-									minValueMap[newDate] = handleDataMap[date]
-								}
-							} else {
-								minValueMap[newDate] = handleDataMap[date]
-							}
-
-							dataTimeMap[newDate] = newDate
-
-							newDate = newDate.AddDate(1, 0, 0)
+							//newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year() - 1, 0, 0)
+							//// 处理上下限列表
+							//if value, ok := maxValueMap[newDate]; ok {
+							//	if value < handleDataMap[date] {
+							//		maxValueMap[newDate] = handleDataMap[date]
+							//	}
+							//} else {
+							//	maxValueMap[newDate] = handleDataMap[date]
+							//}
+							//
+							//if value, ok := minValueMap[newDate]; ok {
+							//	if value > handleDataMap[date] {
+							//		minValueMap[newDate] = handleDataMap[date]
+							//	}
+							//} else {
+							//	minValueMap[newDate] = handleDataMap[date]
+							//}
+							//
+							//dataTimeMap[newDate] = newDate
+
+							newDate = newDate.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
 							if value, ok := maxValueMap[newDate]; ok {
 								if value < handleDataMap[date] {
 									maxValueMap[newDate] = handleDataMap[date]
@@ -3943,25 +3943,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						}
 						var newDate time.Time
 						if seasonConfig.JumpYear == 1 {
-							newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year() - 1, 0, 0)
-							if value, ok := maxValueMap[newDate]; ok {
-								if value < vv.Value {
-									maxValueMap[newDate] = vv.Value
-								}
-							} else {
-								maxValueMap[newDate] = vv.Value
-							}
-
-							if value, ok := minValueMap[newDate]; ok {
-								if value > vv.Value {
-									minValueMap[newDate] = vv.Value
-								}
-							} else {
-								minValueMap[newDate] = vv.Value
-							}
-							dataTimeMap[newDate] = newDate
-
-							newDate = newDate.AddDate(1, 0, 0)
+							newDate = newDate.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
 							if value, ok := maxValueMap[newDate]; ok {
 								if value < vv.Value {
 									maxValueMap[newDate] = vv.Value