From caadb52788bb1ad4ed04a0bdb0ec2fa5fe3df03b Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 13 八月 2024 17:50:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
index 107906d..5813605 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
@@ -548,4 +548,93 @@
#{item}
</foreach>
</select>
+ <select id="queryOrderByState" resultType="com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar">
+ select
+ id as id,
+ `type` as `type`,
+ userId as userId,
+ serverCarModelId as serverCarModelId,
+ driverId as driverId,
+ carId as carId,
+ orderNum as orderNum,
+ placementLon as placementLon,
+ placementLat as placementLat,
+ placementAddress as placementAddress,
+ startLon as startLon,
+ startLat as startLat,
+ startAddress as startAddress,
+ endLon as endLon,
+ endLat as endLat,
+ endAddress as endAddress,
+ boardingLon as boardingLon,
+ boardingLat as boardingLat,
+ boardingAddress as boardingAddress,
+ boardingTime as boardingTime,
+ getoffLon as getoffLon,
+ getoffLat as getoffLat,
+ getoffAddress as getoffAddress,
+ getoffTime as getoffTime,
+ mileage as mileage,
+ payManner as payManner,
+ payType as payType,
+ orderMoney as orderMoney,
+ startMileage as startMileage,
+ startMoney as startMoney,
+ mileageKilometers as mileageKilometers,
+ mileageMoney as mileageMoney,
+ duration as duration,
+ durationMoney as durationMoney,
+ wait as wait,
+ waitMoney as waitMoney,
+ longDistance as longDistance,
+ longDistanceMoney as longDistanceMoney,
+ parkMoney as parkMoney,
+ roadTollMoney as roadTollMoney,
+ redPacketMoney as redPacketMoney,
+ couponMoney as couponMoney,
+ redPacketId as redPacketId,
+ couponId as couponId,
+ discount as discount,
+ discountMoney as discountMoney,
+ activityId as activityId,
+ companyId as companyId,
+ payMoney as payMoney,
+ substitute as substitute,
+ passengers as passengers,
+ passengersPhone as passengersPhone,
+ state as state,
+ insertTime as insertTime,
+ travelTime as travelTime,
+ snatchOrderTime as snatchOrderTime,
+ setOutTime as setOutTime,
+ arriveTime as arriveTime,
+ startServiceTime as startServiceTime,
+ endServiceTime as endServiceTime,
+ orderType as orderType,
+ orderSource as orderSource,
+ invoiceId as invoiceId,
+ isReassign as isReassign,
+ reassignNotice as reassignNotice,
+ trackId as trackId,
+ isDelete as isDelete,
+ oldState as oldState,
+ telX as telX,
+ bindId as bindId
+ from t_order_private_car where isDelete = 1
+ <if test="null != driverIds and driverIds.size()>0">
+ and driverId in
+ <foreach collection="driverIds" item="driverId" index="index" open="(" separator="," close=")">
+ #{driverId}
+ </foreach>
+ </if>
+ <if test="null != orderType">
+ and orderType = #{orderType}
+ </if>
+ <if test="null != state">
+ and state in
+ <foreach collection="state" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1