Browse Source

数据源统计表修改

xyxie 1 year ago
parent
commit
1645a5f2be
2 changed files with 23 additions and 19 deletions
  1. 1 0
      models/data_stat/edb_info_update_stat.go
  2. 22 19
      services/edb_info_stat.go

+ 1 - 0
models/data_stat/edb_info_update_stat.go

@@ -33,6 +33,7 @@ type EdbInfoUpdateStat struct {
 	DataUpdateTime         string    `description:"数据更新时间"`
 	UpdateResult           int       `description:"本次刷新操作结果:1成功,2失败"`
 	UpdateFailedReason     string    `description:"刷新失败原因"`
+	UpdateTime             string    `description:"刷新时间"`
 	ModifyTime             time.Time `description:"修改时间"`
 	IsAdd                  int       `description:"是否是当日新增的指标:1是,2否"`
 	NeedRefresh            int       `description:"今日是否需要定时刷新,1需要,0不需要"`

+ 22 - 19
services/edb_info_stat.go

@@ -112,25 +112,27 @@ func SetMysteelChemicalEdbInfoUpdateStat() (err error) {
 	if len(edbList) > 0 {
 		for _, v := range edbList {
 			tmp := &data_stat.EdbInfoUpdateStat{
-				EdbInfoId:       v.EdbInfoId,
-				SourceName:      v.SourceName,
-				Source:          v.Source,
-				EdbCode:         v.EdbCode,
-				EdbName:         v.EdbName,
-				EdbNameSource:   v.EdbNameSource,
-				Frequency:       v.Frequency,
-				Unit:            v.Unit,
-				StartDate:       v.StartDate,
-				EndDate:         v.EndDate,
-				SysUserId:       v.SysUserId,
-				SysUserRealName: v.SysUserRealName,
-				UniqueCode:      v.UniqueCode,
-				EdbCreateTime:   v.CreateTime,
-				EdbModifyTime:   v.ModifyTime,
-				LatestDate:      v.LatestDate,
-				LatestValue:     v.LatestValue,
-				TerminalCode:    v.TerminalCode,
-				ModifyTime:      nowTime,
+				EdbInfoId:        v.EdbInfoId,
+				SourceName:       v.SourceName,
+				Source:           v.Source,
+				EdbCode:          v.EdbCode,
+				EdbName:          v.EdbName,
+				EdbNameSource:    v.EdbNameSource,
+				Frequency:        v.Frequency,
+				Unit:             v.Unit,
+				StartDate:        v.StartDate,
+				EndDate:          v.EndDate,
+				SysUserId:        v.SysUserId,
+				SysUserRealName:  v.SysUserRealName,
+				UniqueCode:       v.UniqueCode,
+				EdbCreateTime:    v.CreateTime,
+				EdbModifyTime:    v.ModifyTime,
+				LatestDate:       v.LatestDate,
+				LatestValue:      v.LatestValue,
+				TerminalCode:     v.TerminalCode,
+				DataUpdateTime:   v.DataUpdateTime,
+				ErDataUpdateDate: v.ErDataUpdateDate,
+				ModifyTime:       nowTime,
 			}
 			needRefresh, _ := checkMySteelEdbInfoNeedRefresh(v.Frequency)
 			tmp.NeedRefresh = needRefresh
@@ -149,6 +151,7 @@ func SetMysteelChemicalEdbInfoUpdateStat() (err error) {
 				tmp.HasRefresh = 1
 				tmp.UpdateResult = up.UpdateResult
 				tmp.UpdateFailedReason = up.UpdateFailedReason
+				tmp.UpdateTime = up.CreateTime.Format(utils.FormatDateTime)
 			} else if needRefresh == 1 {
 				tmp.HasRefresh = 0
 				tmp.DataUpdateResult = 2