中期支付

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

@@ -936,6 +936,12 @@ public class ExecutorMeter extends FormulaExecutor {
              List<InterimPayCertificateItem> itemList = tec.meterInfo.getInterimPayCertificateItems();
              itemList.clear();
              if(Func.isNotEmpty(midPayItemList)){
+                 /*暂定金编号,纠正*/
+                 chapters.stream().filter(e->e.getFormName().contains("暂")).findFirst().ifPresent(t->{
+                     midPayItemList.stream().filter(e->e.getPayName().contains("暂")).findFirst().ifPresent(k->{
+                         k.setPayNumber(t.getFormNumber());
+                     });
+                 });
                  /*合计后回显*/
                  Map<InterimPaymentCertificate,InterimPayCertificateItem> peerMap = new HashMap<>();
                  List<InterimPaymentCertificate> payItemZj=new ArrayList<>();
@@ -999,9 +1005,6 @@ public class ExecutorMeter extends FormulaExecutor {
                  }
                  midPayItemList.forEach(e->{
                      String payNumber=e.getPayNumber();
-                     if(e.getPayName().contains("暂")){
-                         payNumber="ZLJE";
-                     }
                      InterimPaymentCertificate ipc = paymentCertificateMap.get(payNumber);
                      if(ipc==null){
                          /*浙江的按照实际的计量单元去显示*/
@@ -1014,16 +1017,6 @@ public class ExecutorMeter extends FormulaExecutor {
                      }
                  });
                  if(payItemZj.size()>0){
-/*                     dataList.stream().filter(t->t.getFormName()!=null&&t.getFormName().contains("暂定金")).findFirst().ifPresent(t->{
-                              t.setFormName("暂定金额");
-                              t.setChapterSeq("");
-                              t.setCurrentPeriodPay("");
-                              t.setCurrentPeriodEndPay("");
-                              t.setPreviousPeriodEndPay("");
-                              t.setPreviousPeriodEndChangeMoney("");
-                              t.setCurrentPeriodChangeMoney("");
-                              t.setCurrentPeriodEndChangeMoney("");
-                     });*/
                      dataList.addAll(payItemZj);
                      /*生成中期支付证书可编辑列表*/
                      /*合并手写内容*/

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

@@ -236,7 +236,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         }
         List<TreeNodeVOByTabType> data;
         if (SelectorModel.ID<=parentId&&parentId<=SelectorModel.MAX_ID) {
-            data = this.baseList();
+            data = this.baseList(titleName);
         } else {
             data = baseMapper.tabTypeLazyTreeAll(page, parentId, titleName);
         }
@@ -289,7 +289,10 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         }).collect(Collectors.toList());
     }
 */
-    public List<TreeNodeVOByTabType> baseList() {
+    public List<TreeNodeVOByTabType> baseList(String name) {
+        if(Func.isNotEmpty(name)) {
+           return DataModel.getTreeNodeList().stream().filter(e->e.getTitle().contains(name)).collect(Collectors.toList());
+        }
         return DataModel.getTreeNodeList();
     }