开工预付款2-6消掉多余空行

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

@@ -637,6 +637,10 @@ public class ExecutorMeter extends FormulaExecutor {
                 }
                 dataList.add(ipc);
             });
+            dataList.stream().filter(t->t.getFormName()!=null&&t.getFormName().contains("暂定金")).findFirst().ifPresent(t->{
+                t.setFormName("暂定金额");
+                t.setChapterSeq("");
+            });
             Map<InterimPaymentCertificate, Map<Function<InterimPaymentCertificate, String>, Consumer<String>>> summaryConfigMap = new HashMap<>();
             InterimPaymentCertificate xj = new InterimPaymentCertificate("小计", true);
             addGetSetConfig(xj, summaryConfigMap, InterimPaymentCertificate::getContractAmount, xj::setContractAmount);
@@ -665,6 +669,15 @@ public class ExecutorMeter extends FormulaExecutor {
             dataList.add(sjzf);
             /*分行合计列，合计的时候需要计入手填部分*/
             fieldGetSet(summaryConfigMap,x->!x.getIsSummary(),InterimPaymentCertificate::getInvertState);
+            dataList.stream().filter(t->t.getChapterSeq()!=null&&t.getChapterSeq().contains("小计")).findFirst().ifPresent(t->{
+                int over= capacity-dataList.size();
+                if(over>0){
+                    int index = dataList.indexOf(t);
+                    for(int i=0;i<over;i++){
+                        dataList.add(index,new InterimPaymentCertificate(""));
+                    }
+                }
+            });
             putOut();
         }
     }