调整订单同步查询条件

bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml

@@ -66,7 +66,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.endTime != null and query.endTime != ''">
             AND o.PICKUP_DATE &lt;= TO_DATE(#{query.endTime}, 'YYYY-MM-DD HH24:MI:SS')
         </if>
-        AND o.BL_PICKUP = 1
+        <choose>
+            <when test="query.blPickup != null">
+                AND o.BL_PICKUP = #{query.blPickup}
+            </when>
+<!--            <otherwise>-->
+<!--                AND o.BL_PICKUP = 1-->
+<!--            </otherwise>-->
+        </choose>
         <if test="query.orderStatuses != null and query.orderStatuses.size() > 0">
             AND o.ORDER_STATUS IN
             <foreach collection="query.orderStatuses" item="st" open="(" separator="," close=")">
@@ -274,7 +281,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="batch" item="bid" open="(" separator="," close=")">
             #{bid}
         </foreach>
-           AND o.BL_PICKUP = 1
+        <choose>
+            <when test="blPickup != null">
+           AND o.BL_PICKUP = #{blPickup}
+            </when>
+<!--            <otherwise>-->
+<!--           AND o.BL_PICKUP = 1-->
+<!--            </otherwise>-->
+        </choose>
            AND o.ORDER_STATUS IN (3, 4, 5, 6, 7, 8, 11)
         <if test="customerCodes != null and customerCodes.size() > 0">
            AND o.CUSTOMER_CODE IN