Merge branch 'feature/eta1.9.6_chart_series' into debug

models/data_manage/chart_info.go

@@ -2672,13 +2672,8 @@ type ChartSectionExtraConf struct {
 
 // 截面组合图额外配置
 type ChartSectionAllExtraConf struct {
-	DateConfList        []*ChartSectionDateConfItem
-	IsHeap              int                      `description:"是否堆积（1.堆积，0不堆积）"`
-	XDataList           []XData                  `description:"横轴名称设置"`
-	UnitList            *ChartSectionCombineUnit `description:"纵轴单位设置"`
-	BaseChartSeriesName string                   `description:"基准系列名称"`
-	SortType            int                      `description:"排序类型，0默认，1升序，2降序"`
-	SeriesList          []*ChartSectionSeriesItem
+	ChartSectionExtraConf
+	SeriesList []*ChartSectionSeriesItem
 }
 
 type ChartSectionDateConfItem struct {

services/data/chart_extra_config.go

@@ -399,12 +399,6 @@ func GetChartSectionCombineData(chartInfo *data_manage.ChartInfo, mappingList []
 				err = fmt.Errorf("指标%d的日期数据不存在", edbInfoId)
 				return
 			}
-			/*dataList := edbDataListMap[edbInfoId] //指标的所有数据值
-			if len(dataList) <= 0 {
-				// 没有数据的指标id
-				//findDataList = append(findDataList, 0)
-				continue
-			}*/
 			//日期变换处理，判断用指标的最新日期还是，直接获取引用日期
 			var findDate string
 			if edbConf.DateConfType == 0 {
@@ -413,6 +407,10 @@ func GetChartSectionCombineData(chartInfo *data_manage.ChartInfo, mappingList []
 					return
 				}
 				findDate, err = GetChartSectionSeriesDateByDateChange(edbInfoId, edbDataList, edbConf.DateConf.DateChange, edbConf.DateConf.MoveForward)
+				if err != nil {
+					err = fmt.Errorf("指标%d的日期变换处理失败", edbInfoId)
+					return
+				}
 			} else {
 				// 获取日期配置
 				dateConfItem, ok1 := DateConfListMap[edbConf.DateConfName]
@@ -431,6 +429,10 @@ func GetChartSectionCombineData(chartInfo *data_manage.ChartInfo, mappingList []
 				}
 
 				findDate, err = GetChartSectionSeriesDateByDateChange(dateConfItem.EdbInfoId, edbDataListTmp, dateConfItem.DateChange, dateConfItem.MoveForward)
+				if err != nil {
+					err = fmt.Errorf("指标%d的日期变换处理失败", dateConfItem.EdbInfoId)
+					return
+				}
 			}
 			findDateTime, _ := time.ParseInLocation(utils.FormatDate, findDate, time.Local)
 			if maxDate.IsZero() {

services/data/chart_info.go

@@ -462,7 +462,7 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 			if v.DateConfName != "" {
 				dateNameMap[v.DateConfName] = 1
 			}
-			if v.DateConfNameEn == "" {
+			if v.DateConfNameEn != "" {
 				dateNameEnMap[v.DateConfNameEn] = 1
 			}
 
@@ -3541,7 +3541,7 @@ func GetChartEdbDataV2(chartInfoId, chartType int, calendar, startDate, endDate
 			if v.DateConfName != "" {
 				dateNameMap[v.DateConfName] = 1
 			}
-			if v.DateConfNameEn == "" {
+			if v.DateConfNameEn != "" {
 				dateNameEnMap[v.DateConfNameEn] = 1
 			}