暂定金额

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

@@ -62,7 +62,12 @@ public class ExecutorFormat extends FormulaExecutor {
                     ElementData ea=la.get(i);
                     ElementData eb=lb.get(i);
                     String a= ea.stringValue();
-                    if(a!=null&&!a.matches("^\\d+.+")||StringUtils.isEquals(eb.stringValue(),"暂定金额")||StringUtils.isEquals(eb.stringValue(),"暂列金额")){
+                    /*StringUtils.isNotEmpty(eb.getValue())&&eb.getValue().toString().contains("暂")*/
+                    if(a!=null&&!a.matches("^\\d+.+")||StringUtils.isNotEmpty(eb.getValue())&&eb.getValue().toString().contains("暂")){
+                        if(StringUtils.isNotEmpty(eb.getValue())&&eb.getValue().toString().contains("暂")) {
+                            ea.setValue(eb.getValue());
+                            eb.setValue("");
+                        }
                         return  ea.getIndex()+"@"+ea.getX()+"@"+ea.getY()+"@"+(eb.getX()+1)+"@"+eb.getY();
                     }
                     return StringPool.EMPTY;

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

@@ -882,7 +882,11 @@ public class ExecutorMeter extends FormulaExecutor {
                      payItemZj.add(sjzf);
                  }
                  midPayItemList.forEach(e->{
-                     InterimPaymentCertificate ipc = paymentCertificateMap.get(e.getPayNumber());
+                     String payNumber=e.getPayNumber();
+                     if(e.getPayName().contains("暂定")){
+                         payNumber="ZLJE";
+                     }
+                     InterimPaymentCertificate ipc = paymentCertificateMap.get(payNumber);
                      if(ipc==null){
                          /*浙江的按照实际的计量单元去显示*/
                          if(!MeterInfo.MB_ZJ.equals(tec.meterInfo.getTemplate())) {
@@ -894,7 +898,7 @@ public class ExecutorMeter extends FormulaExecutor {
                      }
                  });
                  if(payItemZj.size()>0){
-                     dataList.stream().filter(t->t.getFormName()!=null&&t.getFormName().contains("暂定金")).findFirst().ifPresent(t->{
+/*                     dataList.stream().filter(t->t.getFormName()!=null&&t.getFormName().contains("暂定金")).findFirst().ifPresent(t->{
                               t.setFormName("暂定金额");
                               t.setChapterSeq("");
                               t.setCurrentPeriodPay("");
@@ -903,7 +907,7 @@ public class ExecutorMeter extends FormulaExecutor {
                               t.setPreviousPeriodEndChangeMoney("");
                               t.setCurrentPeriodChangeMoney("");
                               t.setCurrentPeriodEndChangeMoney("");
-                     });
+                     });*/
                      dataList.addAll(payItemZj);
                      /*生成中期支付证书可编辑列表*/
                      /*合并手写内容*/