java/IgoTravel.git

			@@ -321,7 +321,8 @@
			isDelete as isDelete,
			oldState as oldState,
			telX as telX,
			bindId as bindId
			bindId as bindId,
			tripId
			from t_order_private_car where isDelete = 1 and userId = #{uid}
			<if test="null != state">
			and state in
			@@ -345,7 +346,8 @@
			state as state,
			oldState as oldState,
			isFrozen,
			cancelMidway
			cancelMidway,
			tripId
			from t_order_private_car where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
			</select>

			@@ -447,7 +449,8 @@
			a.moneyType,
			a.moneyTime,
			a.isFrozen,
			a.snatchOrderTime
			a.tripId,
			DATE_FORMAT(a.snatchOrderTime, '%Y-%m-%d %H:%i:%s') as snatchOrderTime
			from t_order_private_car a
			left join t_driver b on (a.driverId = b.id)
			left join t_car c on (a.carId = c.id)