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

controllers/chart.go

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

controllers/chart_common.go

@@ -189,7 +189,7 @@ func GetFutureGoodChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, key
 	chartInfo.UnitEn = baseEdbInfo.UnitEn
 
 	// 图表的指标来源
-	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(resp.EdbInfoList)
+	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(edbList)
 	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
 	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
 
@@ -370,7 +370,7 @@ func GetCorrelationChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, ke
 	}
 
 	// 图表的指标来源
-	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(resp.EdbInfoList)
+	sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(edbList)
 	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
 	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
 

services/data/edb_info.go

@@ -570,7 +570,7 @@ func GetEdbSourceByEdbInfoIdList(chartEdbInfoMappingList []*models.ChartEdbInfoM
 	sourceMap := make(map[int]string)
 	for _, v := range chartEdbInfoMappingList {
 		// 指标类型:1:基础指标,2:计算指标
-		if v.EdbType == 2 {
+		if v.EdbType == 2 || v.EdbInfoCategoryType == 1 {
 			//sourceMap[0] = "弘则研究"
 			baseEdbInfoArr, _, _ := data_manage.GetRefreshEdbInfoFromBase(v.EdbInfoId, v.Source)
 			for _, baseEdbInfo := range baseEdbInfoArr {