系统设置-数据终端管理-时间显示错误

models/data_manage/edb_terminal.go

@@ -1,6 +1,7 @@
 package data_manage
 
 import (
+	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
@@ -35,6 +36,28 @@ type EdbTerminalItem struct {
 	CreateTime   string `description:"创建时间"`
 }
 
+// [2025-zsh-时间类型修复-chenhan]
+func (item *EdbTerminal) toView() *EdbTerminalItem {
+	return &EdbTerminalItem{
+		TerminalId:   item.TerminalId,
+		Source:       item.Source,
+		Name:         item.Name,
+		TerminalCode: item.TerminalCode,
+		ServerUrl:    item.ServerUrl,
+		DirPath:      item.DirPath,
+		Num:          item.Num,
+		Status:       item.Status,
+		Value:        item.Value,
+		ModifyTime:   item.ModifyTime.Format(utils.FormatDateTime),
+	}
+}
+func toItemList(ormList []*EdbTerminal) (list []*EdbTerminalItem) {
+	for _, v := range ormList {
+		list = append(list, v.toView())
+	}
+	return
+}
+
 type EdbTerminalCode struct {
 	TerminalCode string `description:"终端编码，用于配置在机器上"`
 	Source       int    `description:"指标来源类型"`
@@ -112,7 +135,13 @@ func GetEdbTerminalList() (item []*EdbTerminalItem, err error) {
 func GetEdbTerminalBySource(source int) (item []*EdbTerminalItem, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_terminal where source=? ORDER BY terminal_id ASC`
-	_, err = o.Raw(sql, source).QueryRows(&item)
+	// [2025-zsh-时间类型修复-chenhan]
+	var ormList []*EdbTerminal
+	_, err = o.Raw(sql, source).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	item = toItemList(ormList)
 	return
 }
 

models/data_stat/edb_info_update_log.go

@@ -1,6 +1,7 @@
 package data_stat
 
 import (
+	"eta/eta_api/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
@@ -40,6 +41,39 @@ type EdbInfoUpdateLog struct {
 	UpdateType             int       `description:"变更类型，0:数据明细变更，1:基础信息变更, 2:新增指标"`
 }
 
+// [2025-zsh-时间类型修复-chenhan]
+type EdbInfoUpdateLogOrm struct {
+	Id                     uint64    `orm:"column(id);pk;auto"`
+	EdbInfoId              int       `description:"指标ID"`
+	SourceName             string    `description:"来源名称"`
+	Source                 int       `description:"来源id"`
+	EdbCode                string    `description:"指标编码"`
+	EdbName                string    `description:"指标名称"`
+	EdbNameSource          string    `description:"指标名称来源"`
+	Frequency              string    `description:"频率"`
+	Unit                   string    `description:"单位"`
+	StartDate              time.Time `description:"起始日期"`
+	EndDate                time.Time `description:"终止日期"`
+	SysUserId              int       `description:"创建人ID"`
+	SysUserRealName        string    `description:"创建人姓名"`
+	UniqueCode             string    `description:"指标唯一编码"`
+	EdbCreateTime          time.Time `description:"指标创建时间"`
+	EdbModifyTime          time.Time `description:"指标修改时间"`
+	CreateTime             time.Time `description:"创建时间"`
+	UpdateSysUserId        int       `description:"变更人ID"`
+	UpdateSysUserRealName  string    `description:"变更人姓名"`
+	LatestDate             time.Time `description:"数据最新日期"`
+	LatestValue            float64   `description:"数据最新值"`
+	TerminalCode           string    `description:"终端编码，用于配置在机器上"`
+	ErDataUpdateDate       time.Time `description:"本次更新，数据发生变化的最早日期"`
+	UpdateResult           int       `description:"本次刷新操作结果：1成功，2失败"`
+	UpdateFailedReason     string    `description:"刷新失败原因"`
+	DataUpdateResult       int       `description:"数据更新结果：1成功，2失败"`
+	DataUpdateFailedReason string    `description:"数据未正常更新原因"`
+	DataUpdateTime         time.Time `description:"数据更新时间"`
+	IsSourceRefresh        int       `description:"是否为终端刷新到数据源的刷新操作：0否，1是"`
+	UpdateType             int       `description:"变更类型，0:数据明细变更，1:基础信息变更, 2:新增指标"`
+}
 type EdbInfoUpdateLogItem struct {
 	Id                    uint64 `orm:"column(id);pk"`
 	EdbInfoId             int    `description:"指标ID"`
@@ -66,6 +100,47 @@ type EdbInfoUpdateLogItem struct {
 	UpdateType            int     `description:"变更类型，0:数据明细变更，1:基础信息变更, 2:新增指标"`
 }
 
+func (edblogorm *EdbInfoUpdateLogOrm) toView() *EdbInfoUpdateLog {
+	return &EdbInfoUpdateLog{
+		Id:                     edblogorm.Id,
+		EdbInfoId:              edblogorm.EdbInfoId,
+		SourceName:             edblogorm.SourceName,
+		Source:                 edblogorm.Source,
+		EdbCode:                edblogorm.EdbCode,
+		EdbName:                edblogorm.EdbName,
+		EdbNameSource:          edblogorm.EdbNameSource,
+		Frequency:              edblogorm.Frequency,
+		Unit:                   edblogorm.Unit,
+		StartDate:              edblogorm.StartDate.Format("2006-01-02"),
+		EndDate:                edblogorm.EndDate.Format("2006-01-02"),
+		SysUserId:              edblogorm.SysUserId,
+		SysUserRealName:        edblogorm.SysUserRealName,
+		UniqueCode:             edblogorm.UniqueCode,
+		EdbCreateTime:          edblogorm.EdbCreateTime,
+		EdbModifyTime:          edblogorm.EdbModifyTime,
+		CreateTime:             edblogorm.CreateTime,
+		UpdateSysUserId:        edblogorm.UpdateSysUserId,
+		UpdateSysUserRealName:  edblogorm.UpdateSysUserRealName,
+		LatestDate:             edblogorm.LatestDate.Format(utils.FormatDate),
+		LatestValue:            edblogorm.LatestValue,
+		UpdateType:             edblogorm.UpdateType,
+		UpdateResult:           edblogorm.UpdateResult,
+		UpdateFailedReason:     edblogorm.UpdateFailedReason,
+		DataUpdateResult:       edblogorm.DataUpdateResult,
+		DataUpdateFailedReason: edblogorm.DataUpdateFailedReason,
+		DataUpdateTime:         edblogorm.DataUpdateTime.Format(utils.FormatDateTime),
+		IsSourceRefresh:        edblogorm.IsSourceRefresh,
+		TerminalCode:           edblogorm.TerminalCode,
+		ErDataUpdateDate:       edblogorm.ErDataUpdateDate.Format(utils.FormatDate),
+	}
+}
+
+func toEdbUpdateLogList(edblogOrmList []*EdbInfoUpdateLogOrm) (logList []*EdbInfoUpdateLog) {
+	for _, item := range edblogOrmList {
+		logList = append(logList, item.toView())
+	}
+	return
+}
 func AddEdbUpdateLog(item *EdbInfoUpdateLog) (lastId int64, err error) {
 	o := orm.NewOrmUsingDB("data")
 	lastId, err = o.Insert(item)
@@ -90,7 +165,12 @@ func GetEdbUpdateLogByCondition(condition string, pars []interface{}, orderStr s
 	}
 
 	sql += ` LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&item)
+	var ormList []*EdbInfoUpdateLogOrm
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	item = toEdbUpdateLogList(ormList)
 	return
 }