yangyj 11 luni în urmă
părinte
comite
ad817f8efd

+ 3 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/ExecutorMeter.java

@@ -844,8 +844,8 @@ public class ExecutorMeter extends FormulaExecutor {
                             ma.setUnit(e.getUnit());
                             ma.setQuantity(e.getMeterAmount());
                             ma.setPrice(e.getPrice());
-                            ma.setAmount(multiFc.apply(e.getMeterAmount(),e.getPrice()));
-                            ma.setTotal(divideFc.apply(multiFc.apply(ma.getAmount(),ratio),"100"));
+                            ma.setAmount(StringUtils.number2String(multiFc.apply(e.getMeterAmount(),e.getPrice()),0));
+                            ma.setTotal(StringUtils.number2String(divideFc.apply(multiFc.apply(ma.getAmount(),ratio),"100"),0));
                             ma.setSource(e.getSource());
                             /*发票*/
                             ma.setInvoice(e.getStoragePlace());
@@ -1736,7 +1736,7 @@ public class ExecutorMeter extends FormulaExecutor {
                 cs.setItemPercent(ratioFc.apply(cs.getChangeMoney(), baseInfo.getContractAmount().toString()));
                 cs.setItemProgress(ratioFc.apply(cs.getCurrentPeriodEndPay(), cs.getChangeMoney()));
                 /*本期占合同金额*/
-                cs.setCurrentPayPercent(ratioFc.apply(cs.getCurrentPeriodPay(),meterAmount));
+                cs.setCurrentPayPercent(ratioFc.apply(cs.getCurrentPeriodPay(),cs.getContractMoney()));
                 /* 本期末累计支付金额占变更后合同比*/
                 cs.setPayPercent(ratioFc.apply(cs.getCurrentPeriodEndPay(),meterAmountChange));
                 /*本期末占合合同金额 */