Merge branch 'bugfix_5805' 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 {

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, "")