zwxi 7 月之前
父節點
當前提交
293bcdae07
共有 1 個文件被更改,包括 36 次插入0 次删除
  1. 36 0
      services/data/chart_info.go

+ 36 - 0
services/data/chart_info.go

@@ -3349,7 +3349,25 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						if dateTime.Month() == 2 && dateTime.Day() == 29 {
 							continue
 						}
+						var startDateStr string
+						if seasonConfig.JumpYear == 1 {
+							startDateStr = fmt.Sprintf("%d-%s", time.Now().Year()-1, seasonConfig.XStartDate)
+						} else {
+							startDateStr = fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XStartDate)
+						}
+						startDate, err := time.Parse(utils.FormatDate, startDateStr)
+						if err != nil {
+							return
+						}
+						endDateStr := fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XEndDate)
+						endDate, err := time.Parse(utils.FormatDate, endDateStr)
+						if err != nil {
+							return
+						}
 						newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
+						if newDate.Before(startDate) || newDate.After(endDate) {
+							continue
+						}
 						// 处理上下限列表
 						if value, ok := maxValueMap[newDate]; ok {
 							if value < handleDataMap[date] {
@@ -3386,7 +3404,25 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						if dateTime.Month() == 2 && dateTime.Day() == 29 {
 							continue
 						}
+						var startDateStr string
+						if seasonConfig.JumpYear == 1 {
+							startDateStr = fmt.Sprintf("%d-%s", time.Now().Year()-1, seasonConfig.XStartDate)
+						} else {
+							startDateStr = fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XStartDate)
+						}
+						startDate, err := time.Parse(utils.FormatDate, startDateStr)
+						if err != nil {
+							return
+						}
+						endDateStr := fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XEndDate)
+						endDate, err := time.Parse(utils.FormatDate, endDateStr)
+						if err != nil {
+							return
+						}
 						newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
+						if newDate.Before(startDate) || newDate.After(endDate) {
+							continue
+						}
 
 						if value, ok := maxValueMap[newDate]; ok {
 							if value < vv.Value {