|
@@ -1405,10 +1405,14 @@ func getFutureGoodChartInfo(chartInfo *data_manage.ChartInfoView, chartType, dat
|
|
|
name := strings.Split(v.EdbName, "(")
|
|
|
if barConfig.FutureGoodEdbName != "" {
|
|
|
name[0] = barConfig.FutureGoodEdbName
|
|
|
+ } else {
|
|
|
+
|
|
|
}
|
|
|
- v.EdbName = name[0]
|
|
|
if len(name) > 1 {
|
|
|
- v.EdbName = v.EdbName + "(" + name[1]
|
|
|
+ if barConfig.FutureGoodEdbName == "" {
|
|
|
+ barConfig.FutureGoodEdbName = name[0]
|
|
|
+ }
|
|
|
+ v.EdbName = name[0] + "(" + name[1]
|
|
|
}
|
|
|
//英文
|
|
|
// 编译正则表达式,匹配一个或多个数字
|
|
@@ -1418,9 +1422,11 @@ func getFutureGoodChartInfo(chartInfo *data_manage.ChartInfoView, chartType, dat
|
|
|
if barConfig.FutureGoodEdbNameEn != "" {
|
|
|
name[0] = barConfig.FutureGoodEdbNameEn
|
|
|
}
|
|
|
- v.EdbNameEn = name[0]
|
|
|
if len(name) > 1 {
|
|
|
- v.EdbNameEn = v.EdbNameEn + "(" + name[1]
|
|
|
+ if barConfig.FutureGoodEdbNameEn == "" {
|
|
|
+ barConfig.FutureGoodEdbNameEn = name[0]
|
|
|
+ }
|
|
|
+ v.EdbNameEn = name[0] + "(" + name[1]
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1759,10 +1765,14 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
|
|
|
name := strings.Split(v.EdbName, "(")
|
|
|
if barConfig.FutureGoodEdbName != "" {
|
|
|
name[0] = barConfig.FutureGoodEdbName
|
|
|
+ } else {
|
|
|
+
|
|
|
}
|
|
|
- v.EdbName = name[0]
|
|
|
if len(name) > 1 {
|
|
|
- v.EdbName = v.EdbName + "(" + name[1]
|
|
|
+ if barConfig.FutureGoodEdbName == "" {
|
|
|
+ barConfig.FutureGoodEdbName = name[0]
|
|
|
+ }
|
|
|
+ v.EdbName = name[0] + "(" + name[1]
|
|
|
}
|
|
|
//英文
|
|
|
// 编译正则表达式,匹配一个或多个数字
|
|
@@ -1772,9 +1782,11 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
|
|
|
if barConfig.FutureGoodEdbNameEn != "" {
|
|
|
name[0] = barConfig.FutureGoodEdbNameEn
|
|
|
}
|
|
|
- v.EdbNameEn = name[0]
|
|
|
if len(name) > 1 {
|
|
|
- v.EdbNameEn = v.EdbNameEn + "(" + name[1]
|
|
|
+ if barConfig.FutureGoodEdbNameEn == "" {
|
|
|
+ barConfig.FutureGoodEdbNameEn = name[0]
|
|
|
+ }
|
|
|
+ v.EdbNameEn = name[0] + "(" + name[1]
|
|
|
}
|
|
|
}
|
|
|
}
|