修改事件类型

models/data_stat/edb_info_delete_log.go

@@ -1,8 +1,10 @@
 package data_stat
 
 import (
+	"eta/eta_api/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"time"
 )
 
 // EdbInfoDeleteLog 指标删除日志表
@@ -47,6 +49,97 @@ type EdbInfoDeleteLog struct {
 	ErDataUpdateDate   string  `description:"本次更新，数据发生变化的最早日期"`
 }
 
+// [2025-zsh-时间类型修复-chenhan]
+type EdbInfoDeleteLogOrm struct {
+	Id                 uint64    `orm:"column(id);pk;auto"`
+	EdbInfoId          int       `description:"指标ID"`
+	EdbInfoType        int       `description:"指标类型，0：普通指标，1：预测指标"`
+	SourceName         string    `description:"来源名称"`
+	Source             int       `description:"来源id"`
+	EdbCode            string    `description:"指标编码"`
+	EdbName            string    `description:"指标名称"`
+	EdbNameEn          string    `description:"英文指标名称"`
+	EdbNameSource      string    `description:"指标名称来源"`
+	Frequency          string    `description:"频率"`
+	Unit               string    `description:"单位"`
+	UnitEn             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:"创建时间即删除时间"`
+	MinValue           float64   `description:"指标最小值"`
+	MaxValue           float64   `description:"指标最大值"`
+	CalculateFormula   string    `description:"计算公式"`
+	EdbType            int       `description:"指标类型:1:基础指标,2:计算指标"`
+	LatestDate         time.Time `description:"数据最新日期"`
+	LatestValue        float64   `description:"数据最新值"`
+	MoveType           int       `description:"移动方式:1:领先(默认),2:滞后"`
+	MoveFrequency      string    `description:"移动频度"`
+	NoUpdate           int8      `description:"是否停止更新，0：继续更新；1：停止更新"`
+	ChartImage         string    `description:"图表图片"`
+	Calendar           string    `description:"公历/农历" orm:"default(公历);"`
+	DataDateType       string    `orm:"column(data_date_type);size(255);null;default(交易日)"`
+	ManualSave         int       `description:"是否有手动保存过上下限: 0-否; 1-是"`
+	TerminalCode       string    `description:"终端编码，用于配置在机器上"`
+	DelSysUserId       int       `description:"删除人ID"`
+	DelSysUserRealName string    `description:"删除人姓名"`
+	DataUpdateTime     time.Time `description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate   time.Time `description:"本次更新，数据发生变化的最早日期"`
+}
+
+func (edblogorm *EdbInfoDeleteLogOrm) toView() *EdbInfoDeleteLog {
+	return &EdbInfoDeleteLog{
+		Id:                 edblogorm.Id,
+		EdbInfoId:          edblogorm.EdbInfoId,
+		EdbInfoType:        edblogorm.EdbInfoType,
+		SourceName:         edblogorm.SourceName,
+		Source:             edblogorm.Source,
+		EdbCode:            edblogorm.EdbCode,
+		EdbName:            edblogorm.EdbName,
+		EdbNameEn:          edblogorm.EdbNameEn,
+		EdbNameSource:      edblogorm.EdbNameSource,
+		Frequency:          edblogorm.Frequency,
+		Unit:               edblogorm.Unit,
+		UnitEn:             edblogorm.UnitEn,
+		StartDate:          edblogorm.StartDate.Format(utils.FormatDate),
+		EndDate:            edblogorm.EndDate.Format(utils.FormatDate),
+		SysUserId:          edblogorm.SysUserId,
+		SysUserRealName:    edblogorm.SysUserRealName,
+		UniqueCode:         edblogorm.UniqueCode,
+		EdbCreateTime:      edblogorm.EdbCreateTime.Format(utils.FormatDateTime),
+		EdbModifyTime:      edblogorm.EdbModifyTime.Format(utils.FormatDateTime),
+		CreateTime:         edblogorm.CreateTime.Format(utils.FormatDateTime),
+		MinValue:           edblogorm.MinValue,
+		MaxValue:           edblogorm.MaxValue,
+		CalculateFormula:   edblogorm.CalculateFormula,
+		EdbType:            edblogorm.EdbType,
+		LatestDate:         edblogorm.LatestDate.Format(utils.FormatDate),
+		LatestValue:        edblogorm.LatestValue,
+		MoveType:           edblogorm.MoveType,
+		MoveFrequency:      edblogorm.MoveFrequency,
+		NoUpdate:           edblogorm.NoUpdate,
+		ChartImage:         edblogorm.ChartImage,
+		Calendar:           edblogorm.Calendar,
+		DataDateType:       edblogorm.DataDateType,
+		ManualSave:         edblogorm.ManualSave,
+		TerminalCode:       edblogorm.TerminalCode,
+		DelSysUserId:       edblogorm.DelSysUserId,
+		DelSysUserRealName: edblogorm.DelSysUserRealName,
+		DataUpdateTime:     edblogorm.DataUpdateTime.Format(utils.FormatDateTime),
+		ErDataUpdateDate:   edblogorm.ErDataUpdateDate.Format(utils.FormatDate),
+	}
+}
+func toEdbInfoDeleteLogList(edblogOrmList []*EdbInfoDeleteLogOrm) (logList []*EdbInfoDeleteLog) {
+	for _, edblogOrm := range edblogOrmList {
+		logList = append(logList, edblogOrm.toView())
+	}
+	return
+}
+
 type EdbInfoDeleteLogItem struct {
 	Id                 uint64  `orm:"column(id);"`
 	EdbInfoId          int     `description:"指标ID"`
@@ -98,7 +191,13 @@ func GetEdbDeleteLogByCondition(condition string, pars []interface{}, orderStr s
 	}
 
 	sql += ` LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&item)
+	// [2025-zsh-时间类型修复-chenhan]
+	var ormItems []*EdbInfoDeleteLogOrm
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&ormItems)
+	if err != nil {
+		return
+	}
+	item = toEdbInfoDeleteLogList(ormItems)
 	return
 }
 

models/data_stat/edb_info_stat_column.go

@@ -1,6 +1,10 @@
 package data_stat
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta/eta_api/utils"
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
 
 // EdbInfoStatColumn 数据源统计表自定义列
 type EdbInfoStatColumn struct {
@@ -16,7 +20,19 @@ type EdbInfoStatColumn struct {
 	IsShow       int    `description:"是否展示：1展示，0不展示"`
 	ColumnNameEn string `description:"英文字段名称"`
 }
-
+type EdbInfoStatColumnOrm struct {
+	Id           int       `orm:"column(id);pk" description:"自增id"`
+	ColumnName   string    `description:"字段名称"`
+	ColumnKey    string    `description:"字段"`
+	CreateTime   time.Time `description:" 创建时间"`
+	ModifyTime   time.Time `description:"修改时间"`
+	Type         int       `description:"列表类型：1数据源明细表，2数据源统计表，3删除指标列表，4指标信息变更表"`
+	Sort         int       `description:"列排序"`
+	IsMust       int       `description:"是否必选列: 0非必选 1必须"`
+	IsSort       int       `description:"是否是允许排序的列，0否，1是"`
+	IsShow       int       `description:"是否展示：1展示，0不展示"`
+	ColumnNameEn string    `description:"英文字段名称"`
+}
 type EdbInfoStatColumnListItem struct {
 	Id           int    `description:"自增id"`
 	ColumnName   string `description:"字段名称"`
@@ -28,6 +44,27 @@ type EdbInfoStatColumnListItem struct {
 	ColumnNameEn string `description:"英文字段名称"`
 }
 
+func (this *EdbInfoStatColumnOrm) toView() EdbInfoStatColumn {
+	return EdbInfoStatColumn{
+		Id:         this.Id,
+		ColumnName: this.ColumnName,
+		ColumnKey:  this.ColumnKey,
+		CreateTime: this.CreateTime.Format(utils.FormatDateTime),
+		ModifyTime: this.ModifyTime.Format(utils.FormatDateTime),
+		Type:       this.Type,
+		Sort:       this.Sort,
+		IsMust:     this.IsMust,
+		IsSort:     this.IsSort,
+		IsShow:     this.IsShow,
+	}
+}
+func toStatColumnList(ormList []*EdbInfoStatColumnOrm) (list []EdbInfoStatColumn) {
+	for _, v := range ormList {
+		list = append(list, v.toView())
+	}
+	return
+}
+
 type StatColumnList struct {
 	List []*EdbInfoStatColumnListItem
 }
@@ -44,7 +81,13 @@ type EdbInfoStatColumnListReq struct {
 func GetStatColumn(columnType int) (list []EdbInfoStatColumn, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_info_stat_column WHERE type=? ORDER BY sort asc, id asc `
-	_, err = o.Raw(sql, columnType).QueryRows(&list)
+	// [2025-zsh-时间类型修复-chenhan]
+	var ormList []*EdbInfoStatColumnOrm
+	_, err = o.Raw(sql, columnType).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	list = toStatColumnList(ormList)
 	return
 }