fix

controllers/data_manage/chart_info.go

@@ -2664,8 +2664,16 @@ func (this *ChartInfoController) PreviewBarChartInfo() {
 
 	//edbInfoIdList := make([]int, 0)
 	edbInfoIdsList := make([]string, 0)
+	convertMap := make(map[int]*data_manage.ChartEdbInfoMapping, 0)
 	for _, v := range req.EdbInfoIdList {
 		edbInfoIdsList = append(edbInfoIdsList, strconv.Itoa(v.EdbInfoId))
+		convertMap[v.EdbInfoId] = &data_manage.ChartEdbInfoMapping{
+			IsConvert:           v.IsConvert,
+			ConvertType:         v.ConvertType,
+			ConvertValue:        v.ConvertValue,
+			ConvertUnit:         v.ConvertUnit,
+			ConvertEnUnit:       v.ConvertEnUnit,
+		}
 	}
 	mappingList, err := data_manage.GetChartEdbMappingListByEdbInfoId(strings.Join(edbInfoIdsList, ","))
 	if err != nil {
@@ -2673,6 +2681,15 @@ func (this *ChartInfoController) PreviewBarChartInfo() {
 		br.ErrMsg = "获取图表，指标信息失败，Err:" + err.Error()
 		return
 	}
+	for i, item := range mappingList {
+		if _, ok := convertMap[item.EdbInfoId];ok{
+			mappingList[i].ConvertValue = convertMap[item.EdbInfoId].ConvertValue
+			mappingList[i].ConvertUnit = convertMap[item.EdbInfoId].ConvertUnit
+			mappingList[i].ConvertEnUnit = convertMap[item.EdbInfoId].ConvertEnUnit
+			mappingList[i].ConvertType = convertMap[item.EdbInfoId].ConvertType
+			mappingList[i].IsConvert = convertMap[item.EdbInfoId].IsConvert
+		}
+	}
 
 	// 获取图表中的指标数据
 	edbList, xEdbIdValue, yDataList, dataResp, err, errMsg := data.GetChartEdbData(0, chartType, "", "", "", mappingList, string(this.Ctx.Input.RequestBody), "")

models/data_manage/chart_info.go

@@ -1557,15 +1557,15 @@ type BarChartInfoReq struct {
 
 // BarChartInfoEdbItemReq 柱方图预览请求数据（指标相关）
 type BarChartInfoEdbItemReq struct {
-	EdbInfoId int    `description:"指标ID"`
-	Name      string `description:"别名"`
-	NameEn    string `description:"英文别名"`
-	Source    int    `description:"1：ETA图库；2：商品价格"`
-	IsConvert     int                      `description:"是否数据转换 0不转 1转"`
-	ConvertType   int                      `description:"数据转换类型 1乘 2除 3对数"`
-	ConvertValue  float64                  `description:"数据转换值"`
-	ConvertUnit   string                   `description:"数据转换单位"`
-	ConvertEnUnit string                   `description:"数据转换单位"`
+	EdbInfoId     int     `description:"指标ID"`
+	Name          string  `description:"别名"`
+	NameEn        string  `description:"英文别名"`
+	Source        int     `description:"1：ETA图库；2：商品价格"`
+	IsConvert     int     `description:"是否数据转换 0不转 1转"`
+	ConvertType   int     `description:"数据转换类型 1乘 2除 3对数"`
+	ConvertValue  float64 `description:"数据转换值"`
+	ConvertUnit   string  `description:"数据转换单位"`
+	ConvertEnUnit string  `description:"数据转换单位"`
 }
 
 // BarChartInfoDateReq 柱方图预览请求数据（日期相关）