Browse Source

fix:修复编辑预测计算指标(年化,降频)时,更改基础信息不变更的bug

Roc 1 year ago
parent
commit
042cb3bd56
2 changed files with 27 additions and 1 deletions
  1. 15 1
      models/predict_edb_data_calculate_jp.go
  2. 12 0
      models/predict_edb_data_calculate_nh.go

+ 15 - 1
models/predict_edb_data_calculate_jp.go

@@ -108,6 +108,20 @@ func SavePredictCalculateJp(reqEdbInfoId, classifyId int, edbName, frequency, un
 
 		latestDateStr = edbInfo.LatestDate
 		latestValue = edbInfo.LatestValue
+		oldCalculateFormula := edbInfo.CalculateFormula
+		//修改指标信息
+		edbInfo.EdbName = edbName
+		edbInfo.EdbNameSource = edbName
+		edbInfo.Frequency = frequency
+		edbInfo.Unit = unit
+		edbInfo.ClassifyId = classifyId
+		edbInfo.CalculateFormula = formula
+		edbInfo.ModifyTime = time.Now()
+		_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime")
+		if err != nil {
+			return
+		}
+
 		//判断计算指标是否被更换
 		var existCondition string
 		var existPars []interface{}
@@ -119,7 +133,7 @@ func SavePredictCalculateJp(reqEdbInfoId, classifyId int, edbName, frequency, un
 			err = errors.New("判断指标是否改变失败,Err:" + tmpErr.Error())
 			return
 		}
-		if count > 0 { // 指标未被替换,无需重新计算
+		if count > 0 && formula == oldCalculateFormula { // 指标未被替换,无需重新计算
 			return
 		}
 

+ 12 - 0
models/predict_edb_data_calculate_nh.go

@@ -108,6 +108,18 @@ func SavePredictCalculateNh(reqEdbInfoId, classifyId int, edbName, frequency, un
 
 		latestDateStr = edbInfo.LatestDate
 		latestValue = edbInfo.LatestValue
+		//修改指标信息
+		edbInfo.EdbName = edbName
+		edbInfo.EdbNameSource = edbName
+		edbInfo.Frequency = frequency
+		edbInfo.Unit = unit
+		edbInfo.ClassifyId = classifyId
+		edbInfo.CalculateFormula = formula
+		edbInfo.ModifyTime = time.Now()
+		_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime")
+		if err != nil {
+			return
+		}
 
 		//判断计算指标是否被更换
 		var existCondition string