fix

services/data/chart_info.go

@@ -3349,70 +3349,27 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						if dateTime.Month() == 2 && dateTime.Day() == 29 {
 							continue
 						}
-						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(time.Now().Year()-dateTime.Year(), 0, 0)
-							if value, ok := maxValueMap[newDate]; ok {
-								if value < handleDataMap[date] {
-									maxValueMap[newDate] = handleDataMap[date]
-								}
-							} else {
+						newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
+						// 处理上下限列表
+						if value, ok := maxValueMap[newDate]; ok {
+							if value < handleDataMap[date] {
 								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
 						} else {
-							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]
-							}
+							maxValueMap[newDate] = handleDataMap[date]
+						}
 
-							if value, ok := minValueMap[newDate]; ok {
-								if value > handleDataMap[date] {
-									minValueMap[newDate] = handleDataMap[date]
-								}
-							} else {
+						if value, ok := minValueMap[newDate]; ok {
+							if value > handleDataMap[date] {
 								minValueMap[newDate] = handleDataMap[date]
 							}
-
-							dataTimeMap[newDate] = newDate
+						} else {
+							minValueMap[newDate] = handleDataMap[date]
 						}
 
-
+						dataTimeMap[newDate] = newDate
 					}
+
 				} else {
 					// 旬度、月度、季度、半年度 不插值，需要先把日期列表和数据map取出来
 					for _, vv := range v.DataList {
@@ -3429,45 +3386,25 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						if dateTime.Month() == 2 && dateTime.Day() == 29 {
 							continue
 						}
-						var newDate time.Time
-						if seasonConfig.JumpYear == 1 {
-							newDate = newDate.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
-							if value, ok := maxValueMap[newDate]; ok {
-								if value < vv.Value {
-									maxValueMap[newDate] = vv.Value
-								}
-							} else {
-								maxValueMap[newDate] = vv.Value
-							}
+						newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
 
-							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 {
-									maxValueMap[newDate] = vv.Value
-								}
-							} else {
+						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 {
+						if value, ok := minValueMap[newDate]; ok {
+							if value > vv.Value {
 								minValueMap[newDate] = vv.Value
 							}
-							dataTimeMap[newDate] = newDate
+						} else {
+							minValueMap[newDate] = vv.Value
 						}
-
+						dataTimeMap[newDate] = newDate
+					
 					}
 				}
 			}
@@ -3728,11 +3665,11 @@ func MarkerLineCalculate(markerLine data_manage.MarkersLine, dataList interface{
 						}
 						if vv.DataTime >= startDate && vv.DataTime <= endDate {
 							averge += vv.Value
-							length +=1
+							length += 1
 						}
 					} else {
 						averge += vv.Value
-						length +=1
+						length += 1
 					}
 				}
 				averge = averge / float64(length)
@@ -4128,7 +4065,6 @@ func HandleDateChange(date string, edbDateConf data_manage.EdbDateChangeConf) (n
 	return
 }
 
-
 // handleSystemAppointDateT
 // @Description: 处理系统日期相关的指定频率（所在周/旬/月/季/半年/年的最后/最早一天）
 // @author: Roc
@@ -4260,5 +4196,5 @@ func handleSystemAppointDateT2(currDate time.Time, appointDay, frequency string)
 
 // CalculatePercentile 计算数值分位
 func CalculatePercentile(x float64, min float64, max float64) float64 {
-	return (x / 100) * (max - min) + min
-}
+	return (x/100)*(max-min) + min
+}