后端代码bug修复

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

@@ -33,6 +33,7 @@ import java.io.*;
 import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.List;
 @Api(tags = "无车操作")
 @RestController
@@ -141,7 +142,9 @@ public class NoCarController {
     @LoginRequired
     public RespR findBillWay(Page page, NoCarWayBill noCarWayBill) {
         try {
+
             setTimeDue(noCarWayBill);
+            setBillNums(noCarWayBill);
             RespR respR = new RespR(noCarBillWayService.findByPageAndWayBill(page, noCarWayBill));
             return respR;
         }catch (Exception e){
@@ -150,7 +153,13 @@ public class NoCarController {
         }
     }
 
-
+    public void setBillNums(NoCarWayBill noCarWayBill){
+        String billNums = noCarWayBill.getBillNum();
+        if(!StringUtils.isEmpty(billNums)){
+            String [] billNumArr = billNums.split(",");
+            noCarWayBill.setBillNums(Arrays.asList(billNumArr));
+        }
+    }
     /**
      * 分页查询客户运单信息
      *
@@ -244,16 +253,7 @@ public class NoCarController {
     @LoginRequired
     public RespR findNocarInvoices(Page page, BillInvoice billInvoice) {
         try {
-            if(!StringUtils.isEmpty(billInvoice.getInvoiceMakeTime()) && !"null".equals(billInvoice.getInvoiceMakeTime())){
-                String [] res =billInvoice.getInvoiceMakeTime().split(",");
-                billInvoice.setInvoiceMakeStart(res[0]);
-                billInvoice.setInvoiceMakeEnd(res[1].replace("00:00:00","23:59:59"));
-            }
-            if(!StringUtils.isEmpty(billInvoice.getCalculateTime()) && !"null".equals(billInvoice.getCalculateTime())){
-                String [] res =billInvoice.getCalculateTime().split(",");
-                billInvoice.setCalculateTimeStart(res[0]);
-                billInvoice.setCalculateTimeEnd(res[1].replace("00:00:00","23:59:59"));
-            }
+            setParams(billInvoice);
             RespR respR = new RespR(nocarInvoiceService.findByPageAndInvoice(page, billInvoice));
             return respR;
         }catch (Exception e){
@@ -261,7 +261,32 @@ public class NoCarController {
             return new RespR(false,e.getMessage());
         }
     }
+    private void setParams(BillInvoice billInvoice){
+        if(!StringUtils.isEmpty(billInvoice.getInvoiceMakeTime()) && !"null".equals(billInvoice.getInvoiceMakeTime())){
+            String [] res =billInvoice.getInvoiceMakeTime().split(",");
+            billInvoice.setInvoiceMakeStart(res[0]);
+            billInvoice.setInvoiceMakeEnd(res[1].replace("00:00:00","23:59:59"));
+        }
+        if(!StringUtils.isEmpty(billInvoice.getCalculateTime()) && !"null".equals(billInvoice.getCalculateTime())){
+            String [] res =billInvoice.getCalculateTime().split(",");
+            billInvoice.setCalculateTimeStart(res[0]);
+            billInvoice.setCalculateTimeEnd(res[1].replace("00:00:00","23:59:59"));
+        }
+        if(!StringUtils.isEmpty(billInvoice.getWaybillNum())){
+            String [] billNumArr = billInvoice.getWaybillNum().split(",");
+            billInvoice.setWaybillNums(Arrays.asList(billNumArr));
+        }
+
+        if(!StringUtils.isEmpty(billInvoice.getInvoiceCode())){
+            String [] invoiceCodeArr = billInvoice.getInvoiceCode().split(",");
+            billInvoice.setInvoiceCodes(Arrays.asList(invoiceCodeArr));
+        }
 
+        if(!StringUtils.isEmpty(billInvoice.getInvoiceNum())){
+            String [] invoiceNumArr = billInvoice.getInvoiceNum().split(",");
+            billInvoice.setInvoiceNums(Arrays.asList(invoiceNumArr));
+        }
+    }
     /**
      * 批量查询无车发票信息
      *

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

@@ -2,6 +2,8 @@ package com.jkcredit.invoice.model.entity.invoice;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 
+import java.util.List;
+
 /**
  * 运单发票
  */
@@ -26,11 +28,15 @@ public class BillInvoice {
      */
     @Excel(name = "发票代码")
     private String invoiceNum;
+
+    private List<String> invoiceNums;
     /**
      * 发票号码
      */
     @Excel(name = "发票号码")
     private String invoiceCode;
+
+    private List<String> invoiceCodes;
     /**
      *开票时间
      */
@@ -88,6 +94,8 @@ public class BillInvoice {
      */
     @Excel(name = "运单编号")
     private String waybillNum;
+
+    private List<String> waybillNums;
     /**
      * 运单状态  未结束	1
                 开票中	2
@@ -453,6 +461,30 @@ public class BillInvoice {
         this.calculateTimeEnd = calculateTimeEnd;
     }
 
+    public List<String> getInvoiceNums() {
+        return invoiceNums;
+    }
+
+    public void setInvoiceNums(List<String> invoiceNums) {
+        this.invoiceNums = invoiceNums;
+    }
+
+    public List<String> getInvoiceCodes() {
+        return invoiceCodes;
+    }
+
+    public void setInvoiceCodes(List<String> invoiceCodes) {
+        this.invoiceCodes = invoiceCodes;
+    }
+
+    public List<String> getWaybillNums() {
+        return waybillNums;
+    }
+
+    public void setWaybillNums(List<String> waybillNums) {
+        this.waybillNums = waybillNums;
+    }
+
     @Override
     public String toString() {
         return "BillInvoice{" +

src/main/java/com/jkcredit/invoice/model/entity/waybill/NoCarWayBill.java

@@ -3,6 +3,7 @@ package com.jkcredit.invoice.model.entity.waybill;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 无车实体类
@@ -28,6 +29,10 @@ public class NoCarWayBill implements Cloneable{
     private String billNum;
 
     /**
+     * 用于批量查询
+     */
+    private List<String> billNums;
+    /**
      * 车牌号
      */
     @Excel(name = "车牌号码")
@@ -496,6 +501,14 @@ public class NoCarWayBill implements Cloneable{
         this.preEndTime = preEndTime;
     }
 
+    public List<String> getBillNums() {
+        return billNums;
+    }
+
+    public void setBillNums(List<String> billNums) {
+        this.billNums = billNums;
+    }
+
     @Override
     public String toString() {
         return "NoCarWayBill{" +

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

@@ -84,8 +84,11 @@
                 and  buyerName = BINARY #{billInvoice.companyName}
             </if>
 
-            <if test="billInvoice.waybillNum != null and billInvoice.waybillNum != ''">
-                and  waybillNum = BINARY #{billInvoice.waybillNum}
+            <if test="billInvoice.waybillNums != null">
+                and  waybillNum IN
+                <foreach collection="billInvoice.waybillNums" item="billNum" index="index" separator="," open="(" close=")">
+                    #{billNum}
+                </foreach>
             </if>
             <if test="billInvoice.buyerTaxpayerCode != null and billInvoice.buyerTaxpayerCode != ''">
                 and  buyerTaxpayerCode = BINARY #{billInvoice.buyerTaxpayerCode}
@@ -93,11 +96,17 @@
             <if test="billInvoice.plateNum != null and billInvoice.plateNum != ''">
                 and  plateNum = BINARY #{billInvoice.plateNum}
             </if>
-            <if test="billInvoice.invoiceCode != null and billInvoice.invoiceCode != ''">
-                and invoiceCode = #{billInvoice.invoiceCode}
+            <if test="billInvoice.invoiceCodes != null">
+                and invoiceCode IN
+                <foreach collection="billInvoice.invoiceCodes" item="invoiceCode" index="index" separator="," open="(" close=")">
+                    #{invoiceCode}
+                </foreach>
             </if>
-            <if test="billInvoice.invoiceNum != null and billInvoice.invoiceNum != ''">
-                and invoiceNum = #{billInvoice.invoiceNum}
+            <if test="billInvoice.invoiceNums != null">
+                and invoiceNum in
+                <foreach collection="billInvoice.invoiceNums" item="invoiceNum" index="index" separator="," open="(" close=")">
+                    #{invoiceNum}
+                </foreach>
             </if>
             <if test="billInvoice.invoiceMakeStart != null and billInvoice.invoiceMakeStart != ''">
                 and invoiceMakeTime BETWEEN #{billInvoice.invoiceMakeStart} and #{billInvoice.invoiceMakeEnd}

src/main/resources/mapper/waybill/NoCarWaybillMapper.xml

@@ -67,11 +67,11 @@
             <if test="noCarWayBill.companyName != null and noCarWayBill.companyName != ''">
                 and  companyName = BINARY #{noCarWayBill.companyName}
             </if>
-            <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != '' and noCarWayBill.batchNum != '1'">
-                and  billNum = #{noCarWayBill.billNum}
-            </if>
-            <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != '' and noCarWayBill.batchNum == '1'">
-                and  billNum = BINARY #{noCarWayBill.billNum}
+            <if test="noCarWayBill.billNums != null">
+                and  billNum in
+                 <foreach collection="noCarWayBill.billNums" item="billNum" index="index" separator="," open="(" close=")">
+                     #{billNum}
+                 </foreach>
             </if>
             <if test="noCarWayBill.taxplayerCode != null and noCarWayBill.taxplayerCode != ''">
                 and  taxplayerCode = BINARY #{noCarWayBill.taxplayerCode}