Explorar o código

Merge branch 'pool/380' into debug

Roc hai 1 ano
pai
achega
59330c6b08
Modificáronse 2 ficheiros con 5 adicións e 1 borrados
  1. 5 0
      controller/chart/chart_info.go
  2. 0 1
      services/chart/edb_info.go

+ 5 - 0
controller/chart/chart_info.go

@@ -249,6 +249,11 @@ func GetChartInfoDetail(c *gin.Context) {
 		myChartInfo.CreateTime = utils.TimeTransferString(utils.FormatDateTime, exists.CreateTime)
 	}
 
+	// 图表的指标来源
+	sourceNameList, sourceNameEnList := chart.GetEdbSourceByEdbInfoIdList(edbList)
+	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
+	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
+
 	resp := new(chart_info.ChartInfoDetailResp)
 	resp.ChartInfo = chartInfo
 	resp.EdbInfoList = edbList

+ 0 - 1
services/chart/edb_info.go

@@ -545,7 +545,6 @@ func getRefreshEdbInfoListByIds(edbInfoIdList []int) (newBaseEdbInfoArr, newBase
 
 // GetEdbSourceByEdbInfoIdList 获取关联指标的来源
 func GetEdbSourceByEdbInfoIdList(chartEdbInfoMappingList []*chartEdbMappingModel.ChartEdbInfoMappingList) (sourceNameList, sourceNameEnList []string) {
-	fmt.Println(chartEdbInfoMappingList)
 	sourceNameList = []string{}
 	sourceNameEnList = []string{}
 	sourceMap := make(map[int]string)