|
|
@@ -995,8 +995,8 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
dyyfk.setPreviousPeriodEndPay(subtractFc.apply(sumStart,currentStart));
|
|
|
dataList.add(dyyfk);
|
|
|
dataList.add(new InterimPaymentCertificate("扣回动员预付款"));
|
|
|
- dataList.add(new InterimPaymentCertificate("材料设备垫付款"));
|
|
|
- dataList.add(new InterimPaymentCertificate("扣回材料设备垫付款"));
|
|
|
+ dataList.add(new InterimPaymentCertificate("材料预付款"));
|
|
|
+ dataList.add(new InterimPaymentCertificate("扣回材料预付款"));
|
|
|
dataList.add(new InterimPaymentCertificate("保留金"));
|
|
|
InterimPaymentCertificate sjzf = new InterimPaymentCertificate("实际支付");
|
|
|
addGetSetConfig(sjzf, InterimPaymentCertificate::getCurrentPeriodEndPay, sjzf::setCurrentPeriodEndPay);
|
|
|
@@ -1285,8 +1285,8 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- }else if("材料设备垫付款".equals(certificate.getChapterSeq())){
|
|
|
- InterimPayCertificateItem preMaterial = previousMap.get("材料设备垫付款");
|
|
|
+ }else if("材料预付款".equals(certificate.getChapterSeq())){
|
|
|
+ InterimPayCertificateItem preMaterial = previousMap.get("材料预付款");
|
|
|
if(preMaterial!=null){
|
|
|
certificate.setPreviousPeriodEndPay(preMaterial.getCurrentPeriodEndPay());
|
|
|
}
|
|
|
@@ -1321,7 +1321,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
AtomicReference<String> previousPay= new AtomicReference<>("0");
|
|
|
if(StringUtils.isEquals(tec.getPeriodId(),1808289109825830914L)){
|
|
|
/*甬台温5标003期中间计量，2-6保留金的计算规则为：合计+材料预付款金额之和 * 0.1，仅这个合同段这一期的保留金计算规则改变，其余保留金计算还是按照合计的10%来计算--王博念 2024-8-27*/
|
|
|
- dataList.stream().filter(e-> "材料设备垫付款".equals(e.getChapterSeq())).findFirst().ifPresent(c->{
|
|
|
+ dataList.stream().filter(e-> "材料预付款".equals(e.getChapterSeq())).findFirst().ifPresent(c->{
|
|
|
currentPay.set(addFc.apply(c.getCurrentPeriodPay(), String.valueOf(currentPay.get())));
|
|
|
previousPay.set(addFc.apply(c.getPreviousPeriodEndPay(), String.valueOf(previousPay.get())));
|
|
|
});
|
yangyj