浏览代码

研报图表、分享图表、小程序(ETA图库、我的图库)等,图表来源追溯到原始指标

Roc 2 年之前
父节点
当前提交
a48abb57cd
共有 3 个文件被更改,包括 10 次插入11 次删除
  1. 4 4
      controllers/chart.go
  2. 4 4
      controllers/chart_common.go
  3. 2 3
      services/data/edb_info.go

+ 4 - 4
controllers/chart.go

@@ -198,8 +198,8 @@ func (this *ChartController) ChartInfoDetail() {
 
 	// 图表的指标来源
 	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(resp.EdbInfoList)
-	resp.ChartInfo.ChartSource = strings.Join(sourceNameList, ",")
-	resp.ChartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
+	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
+	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
 
 	resp.ChartInfo = chartInfo
 	resp.EdbInfoList = edbList
@@ -465,8 +465,8 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, key string) (
 
 	// 图表的指标来源
 	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(resp.EdbInfoList)
-	resp.ChartInfo.ChartSource = strings.Join(sourceNameList, ",")
-	resp.ChartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
+	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
+	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
 
 	resp.ChartInfo = chartInfo
 	resp.EdbInfoList = edbList

+ 4 - 4
controllers/chart_common.go

@@ -190,8 +190,8 @@ func GetFutureGoodChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, key
 
 	// 图表的指标来源
 	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(resp.EdbInfoList)
-	resp.ChartInfo.ChartSource = strings.Join(sourceNameList, ",")
-	resp.ChartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
+	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
+	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
 
 	resp.ChartInfo = chartInfo
 	resp.EdbInfoList = edbList
@@ -371,8 +371,8 @@ func GetCorrelationChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, ke
 
 	// 图表的指标来源
 	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(resp.EdbInfoList)
-	resp.ChartInfo.ChartSource = strings.Join(sourceNameList, ",")
-	resp.ChartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
+	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
+	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
 
 	correlationInfo := new(models.CorrelationInfo)
 	correlationInfo.LeadValue = correlationChart.LeadValue

+ 2 - 3
services/data/edb_info.go

@@ -565,9 +565,8 @@ func getRefreshEdbInfoListByIds(edbInfoIdList []int) (newBaseEdbInfoArr, newBase
 
 // GetEdbSourceByEdbInfoIdList 获取关联指标的来源
 func GetEdbSourceByEdbInfoIdList(chartEdbInfoMappingList []*models.ChartEdbInfoMapping) (sourceNameList, sourceNameEnList []string) {
-	fmt.Println(chartEdbInfoMappingList)
-	sourceNameList = []string{}
-	sourceNameEnList = []string{}
+	sourceNameList = make([]string, 0)
+	sourceNameEnList = make([]string, 0)
 	sourceMap := make(map[int]string)
 	for _, v := range chartEdbInfoMappingList {
 		// 指标类型:1:基础指标,2:计算指标