Merge branch 'bug/8438' into debug

controllers/data_manage/mysteel_chemical_data.go

@@ -13,6 +13,7 @@ import (
 	etaTrialService "eta/eta_api/services/eta_trial"
 	"eta/eta_api/utils"
 	"fmt"
+	"github.com/shopspring/decimal"
 	"os"
 	"path/filepath"
 	"sort"
@@ -584,14 +585,18 @@ func (this *EdbInfoController) MysteelChemicalData() {
 		total, err := data_manage.GetMysteelChemicalIndexDataCount(v.IndexCode)
 		page := paging.GetPaging(currentIndex, pageSize, total)
 
-		dataList, err := data_manage.GetMysteelChemicalIndexData(v.IndexCode, startSize, pageSize)
+		dataList := make([]*data_manage.MysteelChemicalData, 0)
+		tmpDataList, err := data_manage.GetMysteelChemicalIndexData(v.IndexCode, startSize, pageSize)
 		if err != nil {
 			br.Msg = "获取数据失败"
 			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
 			return
 		}
-		if dataList == nil {
-			dataList = make([]*data_manage.MysteelChemicalData, 0)
+		for _, tmpData := range tmpDataList {
+			dataList = append(dataList, &data_manage.MysteelChemicalData{
+				DataTime:   tmpData.DataTime,
+				InputValue: decimal.NewFromFloat(tmpData.InputValue).String(),
+			})
 		}
 		edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, v.IndexCode)
 		if err != nil && !utils.IsErrNoRow(err) {

models/data_manage/mysteel_chemical_index.go

@@ -238,8 +238,19 @@ func GetMysteelChemicalIndex(condition string, pars []interface{}) (items []*Mys
 	return
 }
 
+// MysteelChemicalData 上海钢联数据列表
+type MysteelChemicalDataItem struct {
+	InputValue float64 `gorm:"column:value" description:"值"`
+	DataTime   string  `gorm:"column:data_time" description:"日期"`
+}
+
+func (m *MysteelChemicalDataItem) AfterFind(tx *gorm.DB) (err error) {
+	m.DataTime = utils.GormDateStrToDateStr(m.DataTime)
+	return
+}
+
 // GetMysteelChemicalIndexData 根据指标code获取上海钢联数据列表
-func GetMysteelChemicalIndexData(indexCode string, startSize, pageSize int) (items []*MysteelChemicalData, err error) {
+func GetMysteelChemicalIndexData(indexCode string, startSize, pageSize int) (items []*MysteelChemicalDataItem, err error) {
 	sql := ` SELECT * FROM (
 	SELECT DISTINCT a.index_code,a.value,a.data_time FROM base_from_mysteel_chemical_data AS a WHERE index_code=? 
 	ORDER BY data_time DESC
@@ -793,5 +804,3 @@ func GetNoEdbMysteelChemicalIndexPageList(condition string, pars []interface{},
 	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
-
-