引用日期类型

models/data_manage/chart_info.go

@@ -2423,6 +2423,7 @@ type ChartSectionSeriesEdbConf struct {
 	Unit         string `description:"单位"`
 	UnitEn       string `description:"英文单位"`
 	DateConfName string `description:"引用日期名称"`
+	DateConfType int    `description:"日期类型，0指标最新日期， 1引用日期"`
 }
 
 type ChartSectionCombineDataResp struct {

models/data_manage/chart_series.go

@@ -132,6 +132,7 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 				//EdbAliasNameEn:          "",
 				DateConfName: edbItem.DateConfName,
 				DateConf:     dateConfStr,
+				DateConfType: edbItem.DateConfType,
 				CreateTime:   time.Now(),
 				ModifyTime:   time.Now(),
 			}
@@ -207,6 +208,7 @@ func AddChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err er
 				//EdbAliasName:            "",
 				//EdbAliasNameEn:          "",
 				DateConfName: edbItem.DateConfName,
+				DateConfType: edbItem.DateConfType,
 				DateConf:     dateConfStr,
 				CreateTime:   time.Now(),
 				ModifyTime:   time.Now(),

models/data_manage/chart_series_edb_mapping.go

@@ -13,6 +13,7 @@ type ChartSeriesEdbMapping struct {
 	EdbAliasName            string    `description:"中文别名"`
 	EdbAliasNameEn          string    `description:"英文别名"`
 	DateConfName            string    `description:"引用日期配置名称"`
+	DateConfType            int       `description:"日期类型，0指标最新日期， 1引用日期"`
 	DateConf                string    `description:"日期配置名称"`
 	ModifyTime              time.Time `description:"修改时间"`
 	CreateTime              time.Time `description:"创建时间"`

services/data/chart_extra_config.go

@@ -407,7 +407,11 @@ func GetChartSectionCombineData(chartInfo *data_manage.ChartInfo, mappingList []
 			}*/
 			//日期变换处理，判断用指标的最新日期还是，直接获取引用日期
 			var findDate string
-			if edbConf.DateConfName == "" {
+			if edbConf.DateConfType == 0 {
+				if edbInfoId == 0 {
+					err = fmt.Errorf("请选择指标")
+					return
+				}
 				findDate, err = GetChartSectionSeriesDateByDateChange(edbInfoId, edbDataList, edbConf.DateConf.DateChange, edbConf.DateConf.MoveForward)
 			} else {
 				// 获取日期配置

services/data/chart_info.go

@@ -397,6 +397,7 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 					Unit:         "",
 					UnitEn:       "",
 					DateConfName: v.DateConfName,
+					DateConfType: v.DateConfType,
 				}
 				seriesEdbMap[v.ChartSeriesId] = append(seriesEdbMap[v.ChartSeriesId], tmp)
 			}
@@ -1818,7 +1819,7 @@ func CheckChartExtraConfig(chartType int, extraConfigStr string) (edbIdList []in
 		hasUsed := make(map[string]struct{})
 		for _, v := range extraConfig.SeriesList {
 			for _, item := range v.EdbInfoList {
-				if item.DateConfName != "" {
+				if item.DateConfName != "" && item.DateConfType == 1 {
 					hasUsed[item.DateConfName] = struct{}{}
 				}
 				if _, ok := edbIdMap[item.EdbInfoId]; !ok {