..处理重复问题

models/data_manage/chart_info.go

@@ -2366,13 +2366,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_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
 			}
 
@@ -3474,7 +3474,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
 			}