|
@@ -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
|
|
|
}
|
|
|
|