优化代码提交

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

@@ -156,6 +156,7 @@ public class NoCarController {
     public RespR findBillWayCust(Page page, NoCarWayBill noCarWayBill) {
         try {
             setTimeDue2(noCarWayBill);
+            noCarWayBill.setBatchNum("1");
             RespR respR = new RespR(noCarBillWayService.findByPageAndWayBill(page, noCarWayBill));
             return respR;
         }catch (Exception e){

src/main/java/com/jkcredit/invoice/service/lowerService/impl/NoCarServiceImpl.java

@@ -188,12 +188,11 @@ public class NoCarServiceImpl implements NoCarService{
         RespR<VehicleQueryResponse> respR = noCarInterface.vehicleQuery(vehicleQueryRequest);
         if(respR.getCode() == 1){
             log.info("车辆备案查询失败NoCarServiceImpl.customerCarRecQueryUpper{},msg{}",customerCarRec,respR.getMsg());
-            return new RespR(false,respR.getMsg());
         }else{
             customerCarRec.setRecStatus(1);
             updateCustomerCarRec(customerCarRec);
         }
-        return new RespR(respR.getData());
+        return respR;
     }
 
     public synchronized void updateCustomerCarRec(CustomerCarRec customerCarRec){

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

@@ -80,9 +80,7 @@
             <if test="billInvoice.companyName != null and billInvoice.companyName != ''">
                 and  companyName = BINARY #{billInvoice.companyName}
             </if>
-            <if test="billInvoice.customerName != null and billInvoice.customerName != ''">
-                and  customerName = BINARY #{billInvoice.customerName}
-            </if>
+
             <if test="billInvoice.waybillNum != null and billInvoice.waybillNum != ''">
                 and  instr(CONCAT(',',#{billInvoice.waybillNum},','),CONCAT(',',waybillNum,','))>0
             </if>
@@ -92,12 +90,18 @@
             <if test="billInvoice.plateNum != null and billInvoice.plateNum != ''">
                 and  plateNum = BINARY #{billInvoice.plateNum}
             </if>
-            <if test="billInvoice.invoiceCode != null and billInvoice.invoiceCode != ''">
+            <if test="billInvoice.invoiceCode != null and billInvoice.invoiceCode != '' and billInvoice.interType==1">
                 and instr(CONCAT(',',#{billInvoice.invoiceCode},','),CONCAT(',',invoiceCode,','))>0
             </if>
-            <if test="billInvoice.invoiceNum != null and billInvoice.invoiceNum != ''">
+            <if test="billInvoice.invoiceCode != null and billInvoice.invoiceCode != '' and billInvoice.interType==5">
+                and invoiceCode = #{billInvoice.invoiceCode}
+            </if>
+            <if test="billInvoice.invoiceNum != null and billInvoice.invoiceNum != '' and billInvoice.interType==1">
                 and instr(CONCAT(',',#{billInvoice.invoiceNum},','),CONCAT(',',invoiceNum,','))>0
             </if>
+            <if test="billInvoice.invoiceNum != null and billInvoice.invoiceNum != '' and billInvoice.interType==5">
+                and  invoiceNum = #{billInvoice.invoiceNum}
+            </if>
             <if test="billInvoice.invoiceMakeStart != null and billInvoice.invoiceMakeStart != ''">
                 and invoiceMakeTime BETWEEN #{billInvoice.invoiceMakeStart} and #{billInvoice.invoiceMakeEnd}
             </if>
@@ -285,9 +289,6 @@
             <if test="billInvoice.companyName != null and billInvoice.companyName != ''">
                 and  companyName = BINARY #{billInvoice.companyName}
             </if>
-            <if test="billInvoice.customerName != null and billInvoice.customerName != ''">
-                and  customerName = BINARY #{billInvoice.customerName}
-            </if>
             <if test="billInvoice.waybillNum != null and billInvoice.waybillNum != ''">
                 and  waybillNum = BINARY #{billInvoice.waybillNum}
             </if>

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

@@ -64,9 +64,12 @@
             <if test="noCarWayBill.companyName != null and noCarWayBill.companyName != ''">
                 and  companyName = BINARY #{noCarWayBill.companyName}
             </if>
-            <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != ''">
+            <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != '' and noCarWayBill.batchNum != '1'">
                 and   instr(CONCAT(',',#{noCarWayBill.billNum},','),CONCAT(',',billNum,','))>0
             </if>
+            <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != '' and noCarWayBill.batchNum == '1'">
+                and  billNum = BINARY #{noCarWayBill.billNum}
+            </if>
             <if test="noCarWayBill.taxplayerCode != null and noCarWayBill.taxplayerCode != ''">
                 and  taxplayerCode = BINARY #{noCarWayBill.taxplayerCode}
             </if>
@@ -79,15 +82,11 @@
             <if test="noCarWayBill.endBegin != null and noCarWayBill.endBegin != ''">
                 and interfaceEndTime BETWEEN #{noCarWayBill.endBegin} and #{noCarWayBill.endEnd}
             </if>
-            <if test="noCarWayBill.batchNum != null and noCarWayBill.batchNum != ''">
-                and  batchNumber = #{noCarWayBill.batchNum}
-            </if>
+
             <if test="noCarWayBill.plateNum != null and noCarWayBill.plateNum != ''">
                 and  plateNum = BINARY #{noCarWayBill.plateNum}
             </if>
-            <if test="noCarWayBill.batchNumEnd != null and noCarWayBill.batchNumEnd != ''">
-                and  batchNumEnd = #{noCarWayBill.batchNumEnd}
-            </if>
+
             <if test="noCarWayBill.success == 1">
                 and billwayStatus in(1,2,3,4)
             </if>