Ver Fonte

Merge remote-tracking branch 'origin/feature/edb_0430' into eta/1.8.4

Roc há 10 meses atrás
pai
commit
07f6694514
1 ficheiros alterados com 28 adições e 26 exclusões
  1. 28 26
      models/data_manage/edb_info.go

+ 28 - 26
models/data_manage/edb_info.go

@@ -45,7 +45,7 @@ type EdbInfo struct {
 	ManualSave       int       `description:"是否有手动保存过上下限: 0-否; 1-是"`
 	TerminalCode     string    `description:"终端编码,用于配置在机器上"`
 	DataUpdateTime   string    `description:"最近一次数据发生变化的时间"`
-	ErDataUpdateDate string    `description:"本次更新,数据发生变化的最早日期"`
+	ErDataUpdateDate time.Time `description:"本次更新,数据发生变化的最早日期"`
 	SourceIndexName  string    `description:"数据源中的指标名称"`
 	SubSource        int       `description:"子数据来源:0:经济数据库,1:日期序列"`
 	SubSourceName    string    `description:"子数据来源名称"`
@@ -85,31 +85,32 @@ func (m *EdbInfo) GetItemByEdbCode(code string) (item *EdbInfo, err error) {
 
 // EdbInfoItem 指标信息
 type EdbInfoItem struct {
-	EdbInfoId       int     `description:"指标信息ID"`
-	UniqueCode      string  `description:"指标唯一编码"`
-	EdbCode         string  `description:"指标编码"`
-	EdbInfoType     int     `description:"指标类型: 0-普通指标; 1-预测指标"`
-	EdbType         int     `description:"指标类型: 1-基础指标; 2-计算指标"`
-	EdbName         string  `description:"指标名称"`
-	ClassifyId      int     `description:"分类ID"`
-	Source          int     `description:"来源ID"`
-	SourceName      string  `description:"来源名称"`
-	Frequency       string  `description:"频率"`
-	Unit            string  `description:"单位"`
-	StartDate       string  `description:"起始日期"`
-	EndDate         string  `description:"终止日期"`
-	MinValue        float64 `description:"指标最小值"`
-	MaxValue        float64 `description:"指标最大值"`
-	LatestDate      string  `description:"数据最新日期"`
-	LatestValue     float64 `description:"数据最新值"`
-	ChartImage      string  `description:"图表图片"`
-	Calendar        string  `description:"公历/农历"`
-	DataDateType    string  `description:"数据日期类型: 交易日/自然日"`
-	Sort            int     `description:"排序"`
-	NoUpdate        int     `description:"是否停更: 0-继续更新; 1-停止更新"`
-	CreateTime      string  `description:"创建时间"`
-	ModifyTime      string  `description:"更新时间"`
-	SysUserRealName string  `description:"创建人姓名"`
+	EdbInfoId        int     `description:"指标信息ID"`
+	UniqueCode       string  `description:"指标唯一编码"`
+	EdbCode          string  `description:"指标编码"`
+	EdbInfoType      int     `description:"指标类型: 0-普通指标; 1-预测指标"`
+	EdbType          int     `description:"指标类型: 1-基础指标; 2-计算指标"`
+	EdbName          string  `description:"指标名称"`
+	ClassifyId       int     `description:"分类ID"`
+	Source           int     `description:"来源ID"`
+	SourceName       string  `description:"来源名称"`
+	Frequency        string  `description:"频率"`
+	Unit             string  `description:"单位"`
+	StartDate        string  `description:"起始日期"`
+	EndDate          string  `description:"终止日期"`
+	MinValue         float64 `description:"指标最小值"`
+	MaxValue         float64 `description:"指标最大值"`
+	LatestDate       string  `description:"数据最新日期"`
+	LatestValue      float64 `description:"数据最新值"`
+	ChartImage       string  `description:"图表图片"`
+	Calendar         string  `description:"公历/农历"`
+	DataDateType     string  `description:"数据日期类型: 交易日/自然日"`
+	Sort             int     `description:"排序"`
+	NoUpdate         int     `description:"是否停更: 0-继续更新; 1-停止更新"`
+	CreateTime       string  `description:"创建时间"`
+	ModifyTime       string  `description:"更新时间"`
+	SysUserRealName  string  `description:"创建人姓名"`
+	ErDataUpdateDate string  `description:"本次更新,数据发生变化的最早日期"`
 	//EdbData      []*EdbDataItem `description:"指标数据"`
 }
 
@@ -141,6 +142,7 @@ func FormatEdbInfo2Item(origin *EdbInfo) (item *EdbInfoItem) {
 	item.Calendar = origin.Calendar
 	item.DataDateType = origin.DataDateType
 	item.SysUserRealName = origin.SysUserRealName
+	item.ErDataUpdateDate = utils.TimeTransferString(utils.FormatDate, origin.ErDataUpdateDate)
 	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, origin.CreateTime)
 	item.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, origin.ModifyTime)
 	//item.EdbData = edbData