Merge remote-tracking branch 'origin/release' into release

dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java

@@ -273,6 +273,14 @@ public class ExtInvoicePoolController extends AbstractController {
                 pullRecordReq.setOrgCode(collect);
                 pullRecordReq.setCompanyCode("");
             }
+            if(pullRecordReq.getAccountPeriod()!=null && pullRecordReq.getAccountPeriod()!=""){
+                String accountPeriod = pullRecordReq.getAccountPeriod();
+                String[] split = accountPeriod.split("-");
+                if(split[1].startsWith("0")){
+                    String replace = split[1].replace("0", "");
+                    pullRecordReq.setAccountPeriod(split[0]+"-"+replace);
+                }
+            }
             return ResponseEntity.ok(R.ok().put("data",extInvoicePoolService.selectPullRecord(pullRecordReq)));
         }catch (Exception e){
             e.printStackTrace();
@@ -282,4 +290,14 @@ public class ExtInvoicePoolController extends AbstractController {
         }
 
     }
+
+
+    public static void main(String[] args) {
+        String str ="2022-04";
+        String[] split = str.split("-");
+        if(split[1].startsWith("0")){
+            String replace = split[1].replace("0", "");
+            System.out.println(replace);
+        }
+    }
 }