Merge branch 'debug' of http://8.136.199.33:3000/eta_server/eta_api into debug

services/data/chart_info.go

@@ -3903,6 +3903,11 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 					if v.ChartLegend == strconv.Itoa(time.Now().Year()) {
 						continue
 					}
+					// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
+					chartLegend,_ := strconv.Atoi(v.ChartLegend)
+					if chartLegend < startYear {
+						continue
+					}
 					for _, date := range dataTimeList {
 						dateTime, e := time.Parse(utils.FormatDate, date)
 						if e != nil {
@@ -4034,6 +4039,11 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						if dateTime.Year() < startYear {
 							continue
 						}
+						// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
+						chartLegend,_ := strconv.Atoi(v.ChartLegend)
+						if chartLegend < startYear {
+							continue
+						}
 						// 月度的2月29号日期改为2月28日
 						if dateTime.Month() == 2 && dateTime.Day() == 29 {
 							dateTime = dateTime.AddDate(0, 0, -1)
@@ -4202,6 +4212,11 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 					if dateTime.Year() < startYear {
 						continue
 					}
+					// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
+					chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
+					if chartLegend < startYear {
+						continue
+					}
 					// 不包含2月29号
 					if dateTime.Month() == 2 && dateTime.Day() == 29 {
 						continue
@@ -4285,6 +4300,11 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 					if dateTime.Year() < startYear {
 						continue
 					}
+					// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
+					chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
+					if chartLegend < startYear {
+						continue
+					}
 					// 不包含2月29号
 					if dateTime.Month() == 2 && dateTime.Day() == 29 {
 						continue

services/data/excel/custom_analysis_edb.go

@@ -119,6 +119,7 @@ func HandleEdbSequenceVal(dateSequenceVal, dataSequenceVal []string) (newDateLis
 			v = strings.Replace(v, "，", "", -1)
 			// 过滤空格
 			v = strings.Replace(v, " ", "", -1)
+			v = strings.TrimSpace(v)
 
 			var tmpVal float64
 			if strings.Contains(v, "%") {
@@ -171,6 +172,7 @@ func HandleEdbSequenceVal(dateSequenceVal, dataSequenceVal []string) (newDateLis
 
 			// 过滤空格
 			v = strings.Replace(v, " ", "", -1)
+			v = strings.TrimSpace(v)
 			t1, tmpErr := dateparse.ParseAny(v)
 			if tmpErr != nil {
 				dateList = append(dateList, "")