1、上传原始运单改造

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

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

@@ -69,16 +69,22 @@
             </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}
+                and taxplayerCode = BINARY #{noCarWayBill.taxplayerCode}
             </if>
             <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus != ''">
                 and billwayStatus = #{noCarWayBill.billwayStatus}
             </if>
+
+            <if test="noCarWayBill.billwayStatus != null and 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>
@@ -87,7 +93,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">
@@ -127,16 +133,22 @@
             </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}
+                and taxplayerCode = BINARY #{noCarWayBill.taxplayerCode}
             </if>
             <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus != ''">
                 and billwayStatus = #{noCarWayBill.billwayStatus}
             </if>
+
+            <if test="noCarWayBill.billwayStatus != null and 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>
@@ -145,7 +157,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">