1、上传原始运单改造

2、超时运单按照数据源返回

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

@@ -129,7 +129,7 @@ public class NoCarWayBill implements Cloneable {
      * 3-开票完成
      * 4 超时作废
      */
-    private int billwayStatus;
+    private Integer billwayStatus;
 
     /**
      * 运单类型 0-实时运单 1-历史运单
@@ -351,11 +351,11 @@ public class NoCarWayBill implements Cloneable {
         this.interfaceEndTime = interfaceEndTime;
     }
 
-    public int getBillwayStatus() {
+    public Integer getBillwayStatus() {
         return billwayStatus;
     }
 
-    public void setBillwayStatus(int billwayStatus) {
+    public void setBillwayStatus(Integer billwayStatus) {
         this.billwayStatus = billwayStatus;
     }
 

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

@@ -69,22 +69,16 @@
             </if>
             <if test="noCarWayBill.billNums != null">
                 and  billNum in
-                <foreach collection="noCarWayBill.billNums" item="billNum" index="index" separator="," open="("
-                         close=")">
-                    #{billNum}
-                </foreach>
+                 <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}
-            </if>
-            <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus != ''">
-                and billwayStatus = #{noCarWayBill.billwayStatus}
+                and  taxplayerCode = BINARY #{noCarWayBill.taxplayerCode}
             </if>
-
-            <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus == 0 ">
+            <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus != '' or noCarWayBill.billwayStatus == 0 ">
                 and billwayStatus = #{noCarWayBill.billwayStatus}
             </if>
-
             <if test="noCarWayBill.startBegin != null and noCarWayBill.startBegin != ''">
                 and intfaceStartTime BETWEEN #{noCarWayBill.startBegin} and #{noCarWayBill.startEnd}
             </if>
@@ -93,7 +87,7 @@
             </if>
 
             <if test="noCarWayBill.plateNum != null and noCarWayBill.plateNum != ''">
-                and plateNum = BINARY #{noCarWayBill.plateNum}
+                and  plateNum = BINARY #{noCarWayBill.plateNum}
             </if>
 
             <if test="noCarWayBill.success == 1">
@@ -133,22 +127,16 @@
             </if>
             <if test="noCarWayBill.billNums != null">
                 and  billNum in
-                <foreach collection="noCarWayBill.billNums" item="billNum" index="index" separator="," open="("
-                         close=")">
+                <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}
-            </if>
-            <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus != ''">
-                and billwayStatus = #{noCarWayBill.billwayStatus}
+                and  taxplayerCode = BINARY #{noCarWayBill.taxplayerCode}
             </if>
-
-            <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus == 0 ">
+            <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus != '' or noCarWayBill.billwayStatus == 0 ">
                 and billwayStatus = #{noCarWayBill.billwayStatus}
             </if>
-
             <if test="noCarWayBill.startBegin != null and noCarWayBill.startBegin != ''">
                 and intfaceStartTime BETWEEN #{noCarWayBill.startBegin} and #{noCarWayBill.startEnd}
             </if>
@@ -157,7 +145,7 @@
             </if>
 
             <if test="noCarWayBill.plateNum != null and noCarWayBill.plateNum != ''">
-                and plateNum = BINARY #{noCarWayBill.plateNum}
+                and  plateNum = BINARY #{noCarWayBill.plateNum}
             </if>
 
             <if test="noCarWayBill.success == 1">