java/QianYunTong.git

			@@ -350,12 +350,12 @@
			CONCAT(j.startTime, '-', j.endTime) as lineShiftTime,
			a.holidayFee,
			a.discountAmount as taxiCardMoney,
			a.responsibilityType,
			a.abnormalStatus,
			a.abnormalRemark,
			a.abnormalIntro,
			a.abnormalImg,
			a.companyId
			a.responsibilityType as responsibilityType,
			a.abnormalStatus as abnormalStatus,
			a.abnormalRemark as abnormalRemark,
			a.abnormalIntro as abnormalIntro,
			a.abnormalImg as abnormalImg,
			a.companyId as companyId
			from t_order_cross_city a
			left join t_driver b on (a.driverId = b.id)
			left join t_car c on (a.carId = c.id)
			@@ -612,4 +612,51 @@
			and DATE_FORMAT(a.travelTime, '%Y-%m-%d') = #{day}
			</if>
			</select>


			<select id="queryMyTripList" resultType="map">
			select
			id as orderId,
			DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime,
			DATE_FORMAT(travelTime, '%m月?d日 %H:%i') as time,
			startAddress as startAddress,
			endAddress as endAddress,
			driverId as driverId,
			(3) as orderType,
			state as state,
			oldState as oldState,
			thankYouFee,
			passengersPhone,
			payMoney,
			endServiceTime,
			companyId,
			arriveTime,
			boardingTime,
			boardingLon,
			boardingLat
			from t_order_cross_city where userId = #{uid} and state in (8, 9) order by insertTime desc limit #{pageNum}, #{size}
			</select>

			<select id="queryMyTripListAll" resultType="map">
			select
			id as orderId,
			DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime,
			DATE_FORMAT(travelTime, '%m月?d日 %H:%i') as time,
			startAddress as startAddress,
			endAddress as endAddress,
			driverId as driverId,
			(3) as orderType,
			state as state,
			oldState as oldState,
			thankYouFee,
			passengersPhone,
			payMoney,
			endServiceTime,
			companyId,
			arriveTime,
			boardingTime,
			boardingLon,
			boardingLat
			from t_order_cross_city where userId = #{uid} and state in (8, 9) order by insertTime desc
			</select>
			</mapper>