xyxie пре 3 недеља
родитељ
комит
57f7f2f2e0

+ 7 - 7
controllers/data_source/sci99.go

@@ -120,13 +120,13 @@ func (this *DataSourceController) Sci99Data() {
 		product.Unit = v.Unit
 		product.ModifyTime = v.ModifyTime
 
-		modifyTime, err := data_source.GetSci99IndexLatestDate(v.IndexCode)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取更新时间失败"
-			br.ErrMsg = "获取更新时间失败,Err:" + err.Error()
-			return
-		}
-		product.ModifyTime = modifyTime
+		// modifyTime, err := data_source.GetSci99IndexLatestDate(v.IndexCode)
+		// if err != nil && !utils.IsErrNoRow(err) {
+		// 	br.Msg = "获取更新时间失败"
+		// 	br.ErrMsg = "获取更新时间失败,Err:" + err.Error()
+		// 	return
+		// }
+		// product.ModifyTime = modifyTime
 
 		total, err := data_source.GetSci99IndexDataCount(v.IndexCode)
 		page := paging.GetPaging(currentIndex, pageSize, total)

+ 10 - 0
models/data_manage/base_from_sci.go

@@ -5,6 +5,8 @@ import (
 	"eta/eta_api/utils"
 	"fmt"
 	"time"
+
+	"gorm.io/gorm"
 )
 
 type BaseFromSci struct {
@@ -72,6 +74,7 @@ type BaseFromSciIndex struct {
 	TerminalCode       string `description:"终端编码"`
 }
 
+
 func AddBaseFromSciIndex(item *BaseFromSciIndex) (lastId int64, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	err = o.Create(item).Error
@@ -100,6 +103,13 @@ type BaseFromSciData struct {
 	DataTimestamp      int64
 }
 
+func (b *BaseFromSciData) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		b.DataTime = utils.GormDateStrToDateStr(b.DataTime)
+	}
+	return
+}
+
 func AddBaseFromSciData(item *BaseFromSciData) (lastId int64, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	err = o.Create(item).Error

+ 4 - 1
models/data_source/base_from_sci99.go

@@ -82,7 +82,6 @@ type BaseFromSci99IndexList struct {
 	DataList           []*BaseFromSci99DataItem `gorm:"-"`
 	Paging             *paging.PagingItem       `description:"分页数据" gorm:"-"`
 }
-
 func (obj *BaseFromSci99IndexList) AfterFind(tx *gorm.DB) (err error) {
 	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
 		if obj.CreateTime != "" {
@@ -177,5 +176,9 @@ func GetSci99IndexLatestDate(indexCode string) (ModifyTime string, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT modify_time FROM base_from_sci99_data WHERE index_code=? ORDER BY modify_time DESC limit 1 `
 	err = o.Raw(sql, indexCode).Scan(&ModifyTime).Error
+	if err != nil {
+		return
+	}
+	ModifyTime = utils.GormDateStrToDateTimeStr(ModifyTime)
 	return
 }