Browse Source

Merge branch 'feature/eta1.5.2_mysteel_stat' into debug

xyxie 1 year ago
parent
commit
842589fd5c
2 changed files with 2 additions and 1 deletions
  1. 1 1
      controllers/data_manage/edb_info.go
  2. 1 0
      controllers/data_stat/edb_source_stat.go

+ 1 - 1
controllers/data_manage/edb_info.go

@@ -2367,7 +2367,7 @@ func (this *EdbInfoController) EdbInfoEdit() {
 
 	// 添加钢联指标更新日志
 	if edbInfo.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
-		if edbInfo.EdbName != req.EdbName || edbInfo.Frequency != edbInfo.Frequency || edbInfo.Unit != req.Unit {
+		if edbInfo.EdbName != req.EdbName || edbInfo.Frequency != req.Frequency || edbInfo.Unit != req.Unit {
 			go data_stat.AddEdbInfoUpdateLog(req.EdbInfoId, 1, "", sysUser, 1)
 		}
 	}

+ 1 - 0
controllers/data_stat/edb_source_stat.go

@@ -433,6 +433,7 @@ func (this *EdbSourceStatController) EdbUpdateLog() {
 		if v.ErDataUpdateDate != utils.EmptyDateStr {
 			tmp.ErDataUpdateDate = v.ErDataUpdateDate
 		}
+		tmp.UpdateType = v.UpdateType
 		list = append(list, tmp)
 	}