|
|
@@ -1011,7 +1011,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
payItemZj.add(new InterimPaymentCertificate("扣回材料设备垫付款"));
|
|
|
blj=new InterimPaymentCertificate("保留金",MINUS_ONE);
|
|
|
payItemZj.add(blj);
|
|
|
- InterimPaymentCertificate thblj=new InterimPaymentCertificate("退还保留金",true);
|
|
|
+ InterimPaymentCertificate thblj=new InterimPaymentCertificate("退还保留金");
|
|
|
thblj.setNoApply(1);
|
|
|
payItemZj.add(thblj);
|
|
|
InterimPaymentCertificate sjzf=new InterimPaymentCertificate("实际支付",true);
|
|
|
@@ -1105,12 +1105,9 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
fieldGetSet(x->!x.getIsSummary(),InterimPaymentCertificate::getInvertState);
|
|
|
InterimPaymentCertificate finalBlj = blj;
|
|
|
dataList.stream().filter(e->e.getChapterSeq().equals("合计")).findFirst().ifPresent(t->{
|
|
|
- finalBlj.setCurrentPeriodPay(multiFc.apply(t.getCurrentPeriodPay(),"0.1"));
|
|
|
- /* itemList.stream().filter(e->e.getChapterSeq().equals("保留金")).findFirst().ifPresent(k->{
|
|
|
- k.setCurrentPeriodPay(finalBlj.getCurrentPeriodPay());
|
|
|
- });*/
|
|
|
+ finalBlj.setCurrentPeriodPay("-"+multiFc.apply(t.getCurrentPeriodPay(),"0.1"));
|
|
|
dataList.stream().filter(e->e.getChapterSeq().equals("实际支付")).findFirst().ifPresent(w->{
|
|
|
- w.setCurrentPeriodPay(subtractFc.apply(w.getCurrentPeriodPay(),finalBlj.getCurrentPeriodPay()));
|
|
|
+ w.setCurrentPeriodPay(addFc.apply(w.getCurrentPeriodPay(),finalBlj.getCurrentPeriodPay()));
|
|
|
});
|
|
|
});
|
|
|
if(peerMap.size()>0) {
|
yangyj