|
@@ -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=?
|