Преглед на файлове

计量表2-16,保通道路

yangyj преди 6 месеца
родител
ревизия
7996c7dfe9
променени са 1 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 6 2
      blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/ExecutorMeter.java

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

@@ -2367,13 +2367,17 @@ public class ExecutorMeter extends FormulaExecutor {
                 Payment pm =paymentList.get(0);
                 String pnb=  pm.getNumber().split("-")[0];
                 if(BaseUtils.isNumber(pnb)){
-                    return 100 * (Integer.parseInt(pnb) / 100) +"章";
+                    String c=100 * (Integer.parseInt(pnb) / 100) +"章";
+                    if(pm.getNumber().contains(BTDL)){
+                        return c+BTDL;
+                    }
+                    return c;
                 }
             }
           String[]  arr= meterApply.getMeterNumber().split("-");
           return BaseUtils.handleObj2Integer(arr[arr.length-1])*100+"章";
         };
-        private Function<NodeTable,String> chapterNumberTableFc= nodeTable -> RegexUtil.findResult("\\d+章",nodeTable.getNodeName());
+        private Function<NodeTable,String> chapterNumberTableFc= nodeTable -> RegexUtil.findResult("\\d+章(保通道路)?",nodeTable.getNodeName());
         private  Map<Long,List<Payment>> paymentGroup=new HashMap<>();
         @Override
         public void parse() {