浏览代码

fix:商品价格曲线调整

Roc 2 年之前
父节点
当前提交
e5ed3c25d9
共有 2 个文件被更改,包括 14 次插入12 次删除
  1. 7 6
      models/chart.go
  2. 7 6
      services/data/future_good/chart_info.go

+ 7 - 6
models/chart.go

@@ -170,12 +170,13 @@ type XData struct {
 
 // YData 柱方图的y轴数据
 type YData struct {
-	Date          string    `description:"数据日期"`
-	Color         string    `description:"数据颜色"`
-	Name          string    `description:"别名"`
-	NameEn        string    `description:"英文别名"`
-	Value         []float64 `description:"每个指标的值"`
-	NoDataEdbList []int     `description:"没有数据的指标列表"`
+	Date           string    `description:"数据日期"`
+	Color          string    `description:"数据颜色"`
+	Name           string    `description:"别名"`
+	NameEn         string    `description:"英文别名"`
+	Value          []float64 `description:"每个指标的值"`
+	NoDataEdbList  []int     `description:"没有数据的指标列表"`
+	XEdbInfoIdList []int     `description:"对应X轴的指标id列表"`
 }
 
 // 指标季度数据计算(公历转农历)

+ 7 - 6
services/data/future_good/chart_info.go

@@ -355,12 +355,13 @@ func BarChartData(edbInfoMapping *models.ChartEdbInfoMapping, futureGoodMappingL
 		}
 
 		yDataList = append(yDataList, models.YData{
-			Date:          yDate,
-			Value:         findDataList,
-			NoDataEdbList: noDataIdList,
-			Color:         barChartInfoDate.Color,
-			Name:          yName,
-			NameEn:        yNameEn,
+			Date:           yDate,
+			Value:          findDataList,
+			NoDataEdbList:  noDataIdList,
+			XEdbInfoIdList: xEdbInfoIdList,
+			Color:          barChartInfoDate.Color,
+			Name:           yName,
+			NameEn:         yNameEn,
 		})
 	}