Browse Source

fix: 指标来源

hsun 8 months ago
parent
commit
82fbbd743c
2 changed files with 23 additions and 10 deletions
  1. 13 1
      controllers/data_manage/factor_edb_series.go
  2. 10 9
      models/data_manage/factor_edb_series.go

+ 13 - 1
controllers/data_manage/factor_edb_series.go

@@ -682,7 +682,19 @@ func (this *FactorEdbSeriesController) CorrelationMatrix() {
 			item.EdbInfoId = edb.EdbInfoId
 			item.EdbCode = edb.EdbCode
 			item.EdbName = edb.EdbName
-			item.SourceName = edb.SourceName
+
+			// 指标来源
+			edbList := make([]*data_manage.ChartEdbInfoMapping, 0)
+			edbList = append(edbList, &data_manage.ChartEdbInfoMapping{
+				EdbInfoId:           edb.EdbInfoId,
+				EdbInfoCategoryType: edb.EdbInfoType,
+				EdbType:             edb.EdbType,
+				Source:              edb.Source,
+				SourceName:          edb.SourceName,
+			})
+			sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(edbList)
+			item.SourceName = strings.Join(sourceNameList, ",")
+			item.SourceNameEn = strings.Join(sourceNameEnList, ",")
 
 			// 获取指标数据
 			dataListB := make([]*data_manage.EdbDataList, 0)

+ 10 - 9
models/data_manage/factor_edb_series.go

@@ -305,15 +305,16 @@ type FactorEdbSeriesCorrelationMatrixResp struct {
 
 // FactorEdbSeriesCorrelationMatrixItem 因子指标系列-相关性矩阵信息
 type FactorEdbSeriesCorrelationMatrixItem struct {
-	SeriesId   int                                      `description:"因子指标系列ID"`
-	EdbInfoId  int                                      `description:"指标ID"`
-	EdbCode    string                                   `description:"指标编码"`
-	EdbName    string                                   `description:"指标名称"`
-	Values     []FactorEdbSeriesCorrelationMatrixValues `description:"X轴和Y轴数据"`
-	Msg        string                                   `description:"提示信息"`
-	ErrMsg     string                                   `description:"错误信息"`
-	Used       bool                                     `description:"是否选中"`
-	SourceName string                                   `description:"指标来源名称"`
+	SeriesId     int                                      `description:"因子指标系列ID"`
+	EdbInfoId    int                                      `description:"指标ID"`
+	EdbCode      string                                   `description:"指标编码"`
+	EdbName      string                                   `description:"指标名称"`
+	Values       []FactorEdbSeriesCorrelationMatrixValues `description:"X轴和Y轴数据"`
+	Msg          string                                   `description:"提示信息"`
+	ErrMsg       string                                   `description:"错误信息"`
+	Used         bool                                     `description:"是否选中"`
+	SourceName   string                                   `description:"指标来源名称"`
+	SourceNameEn string                                   `description:"英文指标来源名称"`
 }
 
 // FactorEdbSeriesCorrelationMatrixValues 因子指标系列-相关性矩阵XY值