Эх сурвалжийг харах

Merge remote-tracking branch 'origin/eta/2.3' into debug

Roc 3 сар өмнө
parent
commit
37db6b16e2

+ 21 - 21
models/data_manage/collect_edb.go

@@ -293,26 +293,26 @@ type CollectEdbInfoQuery struct {
 
 // CollectEdbInfoItem 收藏列表指标信息
 type CollectEdbInfoItem struct {
-	EdbInfoId             int       `description:"指标ID"`
-	EdbInfoType           int       `description:"指标类型:0-普通指标; 1-预测指标"`
-	EdbType               int       `description:"指标类型:1-基础指标; 2-计算指标"`
-	Source                int       `description:"来源ID"`
-	SourceName            string    `description:"来源名称"`
-	EdbCode               string    `description:"指标编码"`
-	EdbName               string    `description:"指标名称"`
-	Frequency             string    `description:"频率"`
-	Unit                  string    `description:"单位"`
-	UniqueCode            string    `description:"唯一编码"`
-	ChartImage            string    `description:"图表图片"`
-	ClassifyId            int       `description:"指标分类ID"`
-	CollectClassifyIdList []int     `description:"收藏分类ID列表"`
-	CollectTime           string    `description:"收藏时间"`
-	CreateTime            string    `description:"创建时间"`
-	Sort                  int       `description:"排序"`
-	LatestDate            string    `description:"数据最新日期(实际日期)"`
-	LatestValue           float64   `description:"数据最新值(实际值)"`
-	EndValue              float64   `description:"数据的最新值(预测日期的最新值)"`
-	EndDate               time.Time `description:"终止日期"`
+	EdbInfoId             int     `description:"指标ID"`
+	EdbInfoType           int     `description:"指标类型:0-普通指标; 1-预测指标"`
+	EdbType               int     `description:"指标类型:1-基础指标; 2-计算指标"`
+	Source                int     `description:"来源ID"`
+	SourceName            string  `description:"来源名称"`
+	EdbCode               string  `description:"指标编码"`
+	EdbName               string  `description:"指标名称"`
+	Frequency             string  `description:"频率"`
+	Unit                  string  `description:"单位"`
+	UniqueCode            string  `description:"唯一编码"`
+	ChartImage            string  `description:"图表图片"`
+	ClassifyId            int     `description:"指标分类ID"`
+	CollectClassifyIdList []int   `description:"收藏分类ID列表"`
+	CollectTime           string  `description:"收藏时间"`
+	CreateTime            string  `description:"创建时间"`
+	Sort                  int     `description:"排序"`
+	LatestDate            string  `description:"数据最新日期(实际日期)"`
+	LatestValue           float64 `description:"数据最新值(实际值)"`
+	EndValue              float64 `description:"数据的最新值(预测日期的最新值)"`
+	EndDate               string  `description:"终止日期"`
 	SysUserId             int
 	SysUserRealName       string
 }
@@ -331,7 +331,7 @@ func FormatEdbInfo2CollectItem(origin *CollectEdbInfoQuery) (item *CollectEdbInf
 	item.UniqueCode = origin.UniqueCode
 	item.ChartImage = origin.ChartImage
 	item.ClassifyId = origin.ClassifyId
-	item.EndDate = origin.EndDate
+	item.EndDate = utils.TimeToFormatDate(origin.EndDate)
 	item.EndValue = origin.EndValue
 	item.LatestDate = origin.LatestDate
 	item.LatestValue = origin.LatestValue