预订单查询返回参数修改

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

@@ -45,16 +45,17 @@
             bookingOrder.purchase_count,
             bookingOrder.qr_type,
             factory.factory_name,
-            package.update_by,
+            ui.user_name AS update_by,
             package.update_time,
             bookingOrder.description,
         IF
-            ( package.sap_order_no IS NULL, 1, 2 ) type
+            ( package.sap_order_no IS NOT NULL, 1, 2 ) type
         FROM
             qr_package_booking_order AS bookingOrder
             LEFT JOIN qr_package AS package ON package.booking_order = bookingOrder.booking_order
             LEFT JOIN base_material AS material ON material.id = package.material_id
             LEFT JOIN base_factory AS factory ON factory.id = bookingOrder.factory_cover_id
+            LEFT JOIN user_info AS ui on package.update_by = ui.id
         <where>
             bookingOrder.is_delete = 0
             <if test="null != queryOrderFormLimitReq.bookingOrder and queryOrderFormLimitReq.bookingOrder !=''">