|
@@ -112,6 +112,7 @@ func EditCalculateCjjx(req *EdbInfoCalculateBatchEditReq, edbInfo, fromEdbInfo *
|
|
|
}()
|
|
|
|
|
|
oldCalculateFormula := edbInfo.CalculateFormula //原先的n值
|
|
|
+ oldCalendar := edbInfo.Calendar //原先的公历、农历
|
|
|
edbInfo, err = GetEdbInfoById(req.EdbInfoId)
|
|
|
if err != nil {
|
|
|
return
|
|
@@ -142,7 +143,7 @@ func EditCalculateCjjx(req *EdbInfoCalculateBatchEditReq, edbInfo, fromEdbInfo *
|
|
|
err = errors.New("判断指标是否改变失败,Err:" + err.Error())
|
|
|
return
|
|
|
}
|
|
|
- if count > 0 && oldCalculateFormula == req.Formula { // 指标未被替换,同时N值未修改,无需重新计算
|
|
|
+ if count > 0 && oldCalculateFormula == req.Formula && oldCalendar == req.Calendar { // 指标未被替换,同时N值未修改,同时公历/农历未变更,无需重新计算
|
|
|
return
|
|
|
}
|
|
|
|