fix

controllers/data_manage/clarksons_data.go

@@ -426,6 +426,11 @@ func (this *ClarksonsDataController) SingleData() {
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
+	dataListResp := make([]*data_manage.BaseFromClarksonsDataItem, 0)
+	for _, v := range dataList {
+		dataListResp = append(dataListResp, v.ToItem())
+	}
+
 	var ret response.ClarksonsSingleDataResp
 	ret.ClassifyId = indexInfo.ClassifyId
 	ret.BaseFromClarksonsIndexId = indexInfo.BaseFromClarksonsIndexId
@@ -436,7 +441,7 @@ func (this *ClarksonsDataController) SingleData() {
 	ret.CreateTime = indexInfo.CreateTime.Format(utils.FormatDateTime)
 	ret.ModifyTime = indexInfo.ModifyTime.Format(utils.FormatDateTime)
 	ret.Unit = indexInfo.Unit
-	ret.Data = dataList
+	ret.Data = dataListResp
 
 	br.Ret = 200
 	br.Success = true

models/data_manage/base_from_clarksons_data.go

@@ -18,6 +18,30 @@ type BaseFromClarksonsData struct {
 	DataTimestamp            int64     `description:"数据时间戳"`
 }
 
+type BaseFromClarksonsDataItem struct {
+	BaseFromClarksonsDataId  int     `orm:"column(base_from_clarksons_data_id);pk;auto"`
+	BaseFromClarksonsIndexId int     `description:"指标id"`
+	IndexCode                string  `description:"指标编码"`
+	DataTime                 string  `description:"数据日期"`
+	Value                    float64 `description:"数据值"`
+	CreateTime               string  `description:"创建时间"`
+	ModifyTime               string  `description:"修改时间"`
+	DataTimestamp            int64   `description:"数据时间戳"`
+}
+
+func (m *BaseFromClarksonsData) ToItem() (item *BaseFromClarksonsDataItem) {
+	return &BaseFromClarksonsDataItem{
+		BaseFromClarksonsDataId:  m.BaseFromClarksonsDataId,
+		BaseFromClarksonsIndexId: m.BaseFromClarksonsIndexId,
+		IndexCode:                m.IndexCode,
+		DataTime:                 m.DataTime.Format(utils.FormatDate),
+		Value:                    m.Value,
+		CreateTime:               m.CreateTime.Format(utils.FormatDateTime),
+		ModifyTime:               m.ModifyTime.Format(utils.FormatDateTime),
+		DataTimestamp:            m.DataTimestamp,
+	}
+}
+
 // GetClarksonsDataByIndexId 根据指标id获取指标数据
 func GetClarksonsDataByIndexId(indexId int) (items []*BaseFromClarksonsData, err error) {
 	o := orm.NewOrmUsingDB("data")

models/data_manage/base_from_clarksons_index.go

@@ -67,7 +67,7 @@ func (m *BaseFromClarksonsIndexOrm) ToView() (item *BaseFromClarksonsIndexView)
 	item.StartDate = m.StartDate.Format(utils.FormatDate)
 	item.EndDate = m.EndDate.Format(utils.FormatDate)
 	item.Sort = m.Sort
-	item.LatestDate = m.LatestDate.Format(utils.FormatDateTime)
+	item.LatestDate = m.LatestDate.Format(utils.FormatDate)
 	item.EdbExist = m.EdbExist
 	item.ModifyTime = m.ModifyTime.Format(utils.FormatDateTime)
 

models/data_manage/base_from_rzd_data.go

@@ -138,7 +138,7 @@ func GetBaseFormRzdDataByCondition(condition string, pars interface{}) (items []
 
 // GetRzdDataListByIndexCodes 根据指标编码查询
 func GetRzdDataListByIndexCodes(IndexCodes string) (items []string, err error) {
-	sql := ` SELECT data_time FROM base_from_rzd_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time DESC `
+	sql := ` SELECT data_time FROM base_from_rzd_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time ORDER BY data_time DESC `
 	o := orm.NewOrmUsingDB("data")
 	_, err = o.Raw(sql).QueryRows(&items)
 	return

models/data_manage/response/clarksons_data.go

@@ -13,23 +13,23 @@ type ClarksonsIndexPageListResp struct {
 
 type EditClarksonsIndexInfoResp struct {
 	BaseFromClarksonsIndexId int
-	IndexCode            string
+	IndexCode                string
 }
 
 type ClarksonsSingleDataResp struct {
 	BaseFromClarksonsIndexId int
-	ClassifyId           int
-	EdbInfoId            int
-	Name                 string
-	IndexCode            string
-	IndexName            string
-	Frequency            string
-	Unit                 string
-	ApiStartTime         string
-	ApiUpdateTime        string
-	StartTime            string
-	FinishTime           string
-	CreateTime           string
-	ModifyTime           string
-	Data                 []*data_manage.BaseFromClarksonsData
+	ClassifyId               int
+	EdbInfoId                int
+	Name                     string
+	IndexCode                string
+	IndexName                string
+	Frequency                string
+	Unit                     string
+	ApiStartTime             string
+	ApiUpdateTime            string
+	StartTime                string
+	FinishTime               string
+	CreateTime               string
+	ModifyTime               string
+	Data                     []*data_manage.BaseFromClarksonsDataItem
 }