Merge remote-tracking branch 'origin/master'

src/main/java/com/jkcredit/invoice/controller/business/NoCarController.java

@@ -288,7 +288,10 @@ public class NoCarController {
             String [] billNumArr = billInvoice.getWaybillNum().split(",");
             billInvoice.setWaybillNums(Arrays.asList(billNumArr));
         }
-
+        if(!StringUtils.isEmpty(billInvoice.getPlateNum())){
+            String [] plateNums = billInvoice.getPlateNum().split(",");
+            billInvoice.setPlateNums(Arrays.asList(plateNums));
+        }
         if(!StringUtils.isEmpty(billInvoice.getInvoiceCode()) && billInvoice.getInvoiceCode().indexOf(',')>0){
             String [] invoiceCodeArr = billInvoice.getInvoiceCode().split(",");
             String [] invoiceNumArr=null;

src/main/java/com/jkcredit/invoice/model/entity/invoice/BillInvoice.java

@@ -96,6 +96,8 @@ public class BillInvoice {
     private String waybillNum;
 
     private List<String> waybillNums;
+
+    private List<String> plateNums;
     /**
      * 运单状态  未结束	1
                 开票中	2
@@ -505,6 +507,14 @@ public class BillInvoice {
         this.msg = msg;
     }
 
+    public List<String> getPlateNums() {
+        return plateNums;
+    }
+
+    public void setPlateNums(List<String> plateNums) {
+        this.plateNums = plateNums;
+    }
+
     @Override
     public String toString() {
         return "BillInvoice{" +

src/main/resources/mapper/invoice/BillInvoiceMapper.xml

@@ -94,11 +94,15 @@
                     #{billNum}
                 </foreach>
             </if>
+
             <if test="billInvoice.buyerTaxpayerCode != null and billInvoice.buyerTaxpayerCode != ''">
                 and  buyerTaxpayerCode = BINARY #{billInvoice.buyerTaxpayerCode}
             </if>
-            <if test="billInvoice.plateNum != null and billInvoice.plateNum != ''">
-                and  plateNum = BINARY #{billInvoice.plateNum}
+            <if test="billInvoice.plateNums != null">
+                and  plateNum IN
+                <foreach collection="billInvoice.plateNums" item="plateNum1" index="index" separator="," open="(" close=")">
+                    #{plateNum1}
+                </foreach>
             </if>
             <if test="billInvoice.codeAndNumVos != null">
                 and (invoiceCode,invoiceNum) IN