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

services/data/chart_extra_config.go

@@ -71,7 +71,7 @@ func HandleExtraConfig(chartType int, extraConfigStr string) (newExtraConfigStr
 			err = e
 			return
 		}
-		extraConfigStr = string(extraConfigByte)
+		newExtraConfigStr = string(extraConfigByte)
 	}
 	return
 }

services/data/chart_info.go

@@ -458,8 +458,13 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 				err = errors.New(errMsg + v.DateConfNameEn)
 				return
 			}
-			dateNameMap[v.DateConfName] = 1
-			dateNameEnMap[v.DateConfNameEn] = 1
+			if v.DateConfName != "" {
+				dateNameMap[v.DateConfName] = 1
+			}
+			if v.DateConfNameEn == "" {
+				dateNameEnMap[v.DateConfNameEn] = 1
+			}
+
 		}
 
 		//检查系列名称是否重复
@@ -476,6 +481,12 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 				err = errors.New(errMsg + v.SeriesNameEn)
 				return
 			}
+			if v.SeriesName != "" {
+				seriesNameMap[v.SeriesName] = 1
+			}
+			if v.SeriesNameEn == "" {
+				seriesNameEnMap[v.SeriesNameEn] = 1
+			}
 		}
 
 		// 检查基准系列是否设置
@@ -1784,8 +1795,13 @@ func CheckChartExtraConfig(chartType int, extraConfigStr string) (edbIdList []in
 				err = errors.New(errMsg + v.DateConfNameEn)
 				return
 			}
-			dateNameMap[v.DateConfName] = 1
-			dateNameEnMap[v.DateConfNameEn] = 1
+			if v.DateConfName != "" {
+				dateNameMap[v.DateConfName] = 1
+			}
+			if v.DateConfNameEn == "" {
+				dateNameEnMap[v.DateConfNameEn] = 1
+			}
+
 		}
 
 		//检查系列名称是否重复
@@ -1802,6 +1818,12 @@ func CheckChartExtraConfig(chartType int, extraConfigStr string) (edbIdList []in
 				err = errors.New(errMsg + v.SeriesNameEn)
 				return
 			}
+			if v.SeriesName != "" {
+				seriesNameMap[v.SeriesName] = 1
+			}
+			if v.SeriesNameEn == "" {
+				seriesNameEnMap[v.SeriesNameEn] = 1
+			}
 		}
 
 		// 检查基准系列是否设置
@@ -3506,8 +3528,13 @@ func GetChartEdbDataV2(chartInfoId, chartType int, calendar, startDate, endDate
 				err = errors.New(errMsg + v.DateConfNameEn)
 				return
 			}
-			dateNameMap[v.DateConfName] = 1
-			dateNameEnMap[v.DateConfNameEn] = 1
+			if v.DateConfName != "" {
+				dateNameMap[v.DateConfName] = 1
+			}
+			if v.DateConfNameEn == "" {
+				dateNameEnMap[v.DateConfNameEn] = 1
+			}
+
 		}
 
 		//检查系列名称是否重复
@@ -3524,6 +3551,12 @@ func GetChartEdbDataV2(chartInfoId, chartType int, calendar, startDate, endDate
 				err = errors.New(errMsg + v.SeriesNameEn)
 				return
 			}
+			if v.SeriesName != "" {
+				seriesNameMap[v.SeriesName] = 1
+			}
+			if v.SeriesNameEn == "" {
+				seriesNameEnMap[v.SeriesNameEn] = 1
+			}
 		}
 
 		// 检查基准系列是否设置