|
|
@@ -1135,7 +1135,7 @@ func DateCalculateFormula(valTagMap map[string]int, calculateFormula string) (ca
|
|
|
expression := formula.NewExpression(formulaFormStr)
|
|
|
calResult, err := expression.Evaluate()
|
|
|
if err != nil {
|
|
|
- errMsg = "计算失败"
|
|
|
+ errMsg = "公式错误,请重新填写"
|
|
|
err = errors.New("计算失败：Err:" + err.Error() + ";formulaStr:" + formulaFormStr)
|
|
|
// 分母为0的报错
|
|
|
if strings.Contains(err.Error(), "divide by zero") {
|
|
|
@@ -1146,7 +1146,7 @@ func DateCalculateFormula(valTagMap map[string]int, calculateFormula string) (ca
|
|
|
}
|
|
|
// 如果计算结果是NAN，那么就提示报错
|
|
|
if calResult.IsNan() {
|
|
|
- errMsg = "计算失败"
|
|
|
+ errMsg = "公式错误,请重新填写"
|
|
|
err = errors.New("计算失败：计算结果是:NAN;formulaStr:" + formulaFormStr)
|
|
|
return
|
|
|
}
|
