Explorar o código

fix:利润英文名称表更参数名

Roc hai 1 ano
pai
achega
8b6f7d9eba

+ 1 - 1
controller/chart/chart_common.go

@@ -353,7 +353,7 @@ func getFutureGoodProfitChartInfoDetail(chartInfo *chartInfoModel.ChartInfoView,
 		YDataList:    yDataList,
 		XDataList:    xDataList,
 		ProfitName:   chartInfoFutureGoodProfit.ProfitName + "盘面利润",
-		ProfitEnName: chartInfoFutureGoodProfit.ProfitEnName,
+		ProfitNameEn: chartInfoFutureGoodProfit.ProfitNameEn,
 		Extra:        extraConf,
 	}
 

+ 1 - 1
models/request/chart.go

@@ -134,7 +134,7 @@ type ChartInfoReq struct {
 	CalculateFormula        string             `description:"计算公式"`
 	BaseEdbInfoId           int                `description:"基础的指标id"`
 	DateList                []ChartInfoDateReq `description:"日期配置"`
-	ProfitEnName            string             `description:"利润英文名称"`
+	ProfitNameEn            string             `description:"利润英文名称"`
 }
 
 // EdbInfoFromTag 计算指标的关联指标

+ 1 - 1
models/response/chart_info/chart_info.go

@@ -63,6 +63,6 @@ type ProfitFutureGoodChartResp struct {
 	XDataList    []XData
 	YDataList    []YData
 	ProfitName   string               `description:"利润的名称"`
-	ProfitEnName string               `description:"利润的英文名称"`
+	ProfitNameEn string               `description:"利润的英文名称"`
 	Extra        request.ChartInfoReq `description:"柱方图的配置"`
 }

+ 3 - 3
models/tables/chart_info_future_good_profit/entity.go

@@ -6,7 +6,7 @@ import "time"
 type ChartInfoFutureGoodProfit struct {
 	ChartInfoId  int       `gorm:"primaryKey;column:chart_info_id;type:int(10) unsigned;not null" json:"-"`        // 图表ID(chart_info表source=5的)
 	ProfitName   string    `gorm:"column:profit_name;type:varchar(16);not null;default:''" json:"profitName"`      // 领先单位
-	ProfitEnName string    `gorm:"column:profit_en_name;type:varchar(16);not null;default:''" json:"profitEnName"` // 领先单位
+	ProfitNameEn string    `gorm:"column:profit_name_en;type:varchar(16);not null;default:''" json:"ProfitNameEn"` // 领先单位
 	XValue       string    `gorm:"column:x_value;type:text" json:"x_value"`                                        // x轴的数据值
 	YValue       string    `gorm:"column:y_value;type:text" json:"y_value"`                                        // y轴的数据值
 	CreateTime   time.Time `gorm:"column:create_time;type:datetime" json:"createTime"`                             // 创建时间
@@ -22,7 +22,7 @@ func (m *ChartInfoFutureGoodProfit) TableName() string {
 var ChartInfoFutureGoodProfitColumns = struct {
 	ChartInfoId  string
 	ProfitName   string
-	ProfitEnName string
+	ProfitNameEn string
 	XValue       string
 	YValue       string
 	CreateTime   string
@@ -30,7 +30,7 @@ var ChartInfoFutureGoodProfitColumns = struct {
 }{
 	ChartInfoId:  "chart_info_id",
 	ProfitName:   "profit_name",
-	ProfitEnName: "profit_en_name",
+	ProfitNameEn: "profit_name_en",
 	XValue:       "x_value",
 	YValue:       "y_value",
 	CreateTime:   "create_time",