|
@@ -308,6 +308,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
|
|
|
@Override
|
|
|
public void parse() {
|
|
|
+ builderFormDatas(MaterialPriceDifferential.class);
|
|
|
/*本期材料*/
|
|
|
materials=tec.meterInfo.getMaterialsAll().stream().filter(e->tec.getPeriodId().equals(e.getPeriodId())).collect(Collectors.toList());
|
|
|
if(materials.size()>0){
|
|
@@ -927,7 +928,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
/* 本期末累计支付金额占合同比*/
|
|
|
sis.setPayPercent(ratioFc.apply(sis.getCurrentPeriodEndPay(),sis.getChangeMoney()));
|
|
|
/**上期末占合合同金额*/
|
|
|
- sis.setPayPercent(ratioFc.apply(subtractFc.apply(sis.getCurrentPeriodEndPay(),sis.getCurrentPeriodPay()),sis.getContractMoney()));
|
|
|
+ sis.setPrePayPercent(ratioFc.apply(subtractFc.apply(sis.getCurrentPeriodEndPay(),sis.getCurrentPeriodPay()),sis.getContractMoney()));
|
|
|
/*变更金额*/
|
|
|
sis.setChangeMoneyAll(subtractFc.apply(sis.getChangeMoney(),sis.getContractMoney()));
|
|
|
/*变更金额*/
|