fix

services/data/chart_info.go

@@ -3351,29 +3351,67 @@ 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)
-						} else {
-							newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year(), 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 := maxValueMap[newDate]; ok {
-							if value < 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)
+							if value, ok := maxValueMap[newDate]; ok {
+								if value < handleDataMap[date] {
+									maxValueMap[newDate] = handleDataMap[date]
+								}
+							} else {
 								maxValueMap[newDate] = handleDataMap[date]
 							}
-						} else {
-							maxValueMap[newDate] = handleDataMap[date]
-						}
 
-						if value, ok := minValueMap[newDate]; ok {
-							if value > handleDataMap[date] {
+							if value, ok := minValueMap[newDate]; ok {
+								if value > handleDataMap[date] {
+									minValueMap[newDate] = handleDataMap[date]
+								}
+							} else {
 								minValueMap[newDate] = handleDataMap[date]
 							}
+
+							dataTimeMap[newDate] = newDate
 						} else {
-							minValueMap[newDate] = handleDataMap[date]
+							newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year(), 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
 						}
 
-						dataTimeMap[newDate] = newDate
+
 					}
 				} else {
 					// 旬度、月度、季度、半年度 不插值，需要先把日期列表和数据map取出来
@@ -3393,26 +3431,61 @@ 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)
+							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)
+							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
 						} else {
 							newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
-						}
-						if value, ok := maxValueMap[newDate]; ok {
-							if value < vv.Value {
+							if value, ok := maxValueMap[newDate]; ok {
+								if value < vv.Value {
+									maxValueMap[newDate] = vv.Value
+								}
+							} else {
 								maxValueMap[newDate] = vv.Value
 							}
-						} else {
-							maxValueMap[newDate] = vv.Value
-						}
 
-						if value, ok := minValueMap[newDate]; ok {
-							if value > vv.Value {
+							if value, ok := minValueMap[newDate]; ok {
+								if value > vv.Value {
+									minValueMap[newDate] = vv.Value
+								}
+							} else {
 								minValueMap[newDate] = vv.Value
 							}
-						} else {
-							minValueMap[newDate] = vv.Value
+							dataTimeMap[newDate] = newDate
 						}
-						dataTimeMap[newDate] = newDate
+
 					}
 				}
 			}