|
@@ -407,10 +407,10 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
InterimPaymentSummary summary = new InterimPaymentSummary();
|
|
InterimPaymentSummary summary = new InterimPaymentSummary();
|
|
summary.setSummary(true);
|
|
summary.setSummary(true);
|
|
summary.setItemName("合计");
|
|
summary.setItemName("合计");
|
|
- summary.setContractAmount(bfc.apply(dataList,InterimPaymentSummary::getContractAmount));
|
|
|
|
- summary.setRevisedAmount(bfc.apply(dataList,InterimPaymentSummary::getRevisedAmount));
|
|
|
|
- summary.setCurrentPeriodPay(bfc.apply(dataList,InterimPaymentSummary::getCurrentPeriodPay));
|
|
|
|
- summary.setCurrentPeriodEndPay(bfc.apply(dataList,InterimPaymentSummary::getCurrentPeriodEndPay));
|
|
|
|
|
|
+ summary.setContractAmount(StringUtils.number2StringZero(bfc.apply(dataList,InterimPaymentSummary::getContractAmount),tec.getScale()));
|
|
|
|
+ summary.setRevisedAmount(StringUtils.number2StringZero(bfc.apply(dataList,InterimPaymentSummary::getRevisedAmount),tec.getScale()));
|
|
|
|
+ summary.setCurrentPeriodPay(StringUtils.number2StringZero(bfc.apply(dataList,InterimPaymentSummary::getCurrentPeriodPay),tec.getScale()));
|
|
|
|
+ summary.setCurrentPeriodEndPay(StringUtils.number2StringZero(bfc.apply(dataList,InterimPaymentSummary::getCurrentPeriodEndPay),tec.getScale()));
|
|
summary.setPayRatioA(ratioFc.apply(summary.getCurrentPeriodEndPay(),summary.getContractAmount()));
|
|
summary.setPayRatioA(ratioFc.apply(summary.getCurrentPeriodEndPay(),summary.getContractAmount()));
|
|
summary.setPayRatioA(ratioFc.apply(summary.getCurrentPeriodEndPay(),summary.getRevisedAmount()));
|
|
summary.setPayRatioA(ratioFc.apply(summary.getCurrentPeriodEndPay(),summary.getRevisedAmount()));
|
|
dataList.add(summary);
|
|
dataList.add(summary);
|