|
@@ -60,9 +60,9 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
/*求百分比*/
|
|
|
private BinaryOperator<String> ratioFc = (a,b)->{
|
|
|
/*合同金额*/
|
|
|
- BigDecimal aBd =new BigDecimal(a);
|
|
|
+ BigDecimal aBd =BaseUtils.str2BigDecimal(a);
|
|
|
/*变更金额*/
|
|
|
- BigDecimal bBd =new BigDecimal(b);
|
|
|
+ BigDecimal bBd =BaseUtils.str2BigDecimal(b);
|
|
|
if(BigDecimal.ZERO.compareTo(bBd)==0){
|
|
|
return "0.0";
|
|
|
}
|