修改查询预订单条件

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageBookingOrderMapper.xml

@@ -51,7 +51,7 @@
             package.update_time,
             bookingOrder.description,
         IF
-            ( bookingOrder.sap_order_no IS NULL, 1, 2 ) type
+            ( package.id IS NULL, 1, 2 ) type
         FROM
             qr_package_booking_order AS bookingOrder
             LEFT JOIN qr_package AS package ON package.booking_order = bookingOrder.booking_order
@@ -72,11 +72,17 @@
             <if test="null != queryOrderFormLimitReq.factoryCoverName and  queryOrderFormLimitReq.factoryCoverName != ''">
                 AND factory.id = #{queryOrderFormLimitReq.factoryCoverName}
             </if>
-            <if test=" 1 == queryOrderFormLimitReq.associateSapOrder or  1 ==queryOrderFormLimitReq.type ">
-                AND package.sap_order_no IS NOT NULL
+            <if test=" 1 == queryOrderFormLimitReq.associateSapOrder">
+                AND bookingOrder.sap_order_no IS NOT NULL
             </if>
-            <if test=" 2 == queryOrderFormLimitReq.associateSapOrder or  2 ==queryOrderFormLimitReq.type ">
-                AND package.sap_order_no IS NULL
+            <if test=" 2 == queryOrderFormLimitReq.associateSapOrder">
+                AND bookingOrder.sap_order_no IS NULL
+            </if>
+            <if test=" 1 ==queryOrderFormLimitReq.type ">
+                AND package.id IS NULL
+            </if>
+            <if test=" 2 ==queryOrderFormLimitReq.type ">
+                AND package.id IS NOT NULL
             </if>
         </where>
         order by bookingOrder.update_time desc