Browse Source

展示图表英文信息

xiexiaoyuan 2 years ago
parent
commit
48e6826810
2 changed files with 42 additions and 11 deletions
  1. 28 1
      controllers/chart.go
  2. 14 10
      models/chart.go

+ 28 - 1
controllers/chart.go

@@ -154,12 +154,14 @@ func (this *ChartController) ChartInfoDetail() {
 		item.Source = v.Source
 		item.EdbCode = v.EdbCode
 		item.EdbName = v.EdbName
+		item.EdbNameEn = v.EdbNameEn
 		item.Frequency = v.Frequency
-
+		item.FrequencyEn = GetFrequencyEn(v.Frequency)
 		//无就是不展示
 		if v.Unit != `无` {
 			item.Unit = v.Unit
 		}
+		item.UnitEn = v.UnitEn
 		item.StartDate = v.StartDate
 		item.EndDate = v.EndDate
 		//item.ModifyTime = v.ModifyTime
@@ -373,3 +375,28 @@ func (this *ChartController) ChartInfoRefresh() {
 	br.Success = true
 	br.Msg = "刷新成功"
 }
+
+// 获取频度的英文版
+func GetFrequencyEn(frequency string) (frequencyEn string) {
+	switch frequency {
+	case "日度":
+		frequencyEn="daily"
+		return
+	case "周度":
+		frequencyEn="weekly"
+		return
+	case "旬度":
+		frequencyEn="Every ten days"
+		return
+	case "月度":
+		frequencyEn="monthly"
+		return
+	case "季度":
+		frequencyEn="quarter"
+		return
+	case "年度":
+		frequencyEn="yearly"
+		return
+	}
+	return
+}

+ 14 - 10
models/chart.go

@@ -14,6 +14,7 @@ import (
 type ChartInfo struct {
 	ChartInfoId     int       `json:"-" orm:"column(chart_info_id);pk"`
 	ChartName       string    `description:"来源名称"`
+	ChartNameEn     string    `description:"英文图表名称"`
 	ChartClassifyId int       `json:"-" description:"图表分类id"`
 	SysUserId       int       `json:"-"`
 	SysUserRealName string    `json:"-"`
@@ -40,15 +41,18 @@ func GetChartInfoByUniqueCode(uniqueCode string) (item *ChartInfo, err error) {
 }
 
 type ChartEdbInfoMapping struct {
-	EdbInfoId  int    `description:"指标id"`
-	SourceName string `description:"来源名称"`
-	Source     int    `description:"来源id"`
-	EdbCode    string `description:"指标编码"`
-	EdbName    string `description:"指标名称"`
-	Frequency  string `description:"频率"`
-	Unit       string `description:"单位"`
-	StartDate  string `description:"起始日期"`
-	EndDate    string `description:"终止日期"`
+	EdbInfoId   int    `description:"指标id"`
+	SourceName  string `description:"来源名称"`
+	Source      int    `description:"来源id"`
+	EdbCode     string `description:"指标编码"`
+	EdbName     string `description:"指标名称"`
+	EdbNameEn   string `description:"英文指标名称"`
+	Frequency   string `description:"频率"`
+	FrequencyEn string `description:"英文频率"`
+	Unit        string `description:"单位"`
+	UnitEn      string `description:"英文单位"`
+	StartDate   string `description:"起始日期"`
+	EndDate     string `description:"终止日期"`
 	//ModifyTime        string  `description:"指标最后更新时间"`
 	//ChartEdbMappingId int     `description:"图表指标id"`
 	ChartInfoId int     `description:"图表id"`
@@ -68,7 +72,7 @@ type ChartEdbInfoMapping struct {
 
 func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT a.*,b.source_name,b.source,b.edb_code,b.edb_name,b.frequency,b.unit,b.start_date,b.end_date,b.modify_time,b.edb_type
+	sql := ` SELECT a.*,b.source_name,b.source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.edb_type
              FROM chart_edb_mapping AS a
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			 WHERE chart_info_id=?