|
@@ -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() {
|