java/QianYunTong.git

			@@ -69,7 +69,73 @@
			<sql id="Base_Column_List">
			id, userId, driverId, lineId, carId, serverCarModelId, orderNum, placementLon, placementLat, placementAddress, startLon, startLat, endLon, startAddress, endLat, endAddress, boardingLon, boardingLat, boardingAddress, boardingTime, getoffLon, getoffLat, getoffAddress, getoffTime, mileage, payManner, payType, orderMoney, redPacketMoney, couponMoney, redPacketId, couponId, discount, discountMoney, activityId, companyId, payMoney, passengers, passengersPhone, sort, insertTime, travelTime, snatchOrderTime, setOutTime, arriveTime, startServiceTime, endServiceTime, travelMode, orderSource, invoiceId, trackId, state, isDelete, telX, bindId
			</sql>

			<select id="getCrossCityOrderListExport" resultType="java.util.Map">
			SELECT * FROM (
			SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
			sc.`name` as serverCarModel,ll.`name` as lineName,ot.* FROM t_order_cross_city as ot
			LEFT JOIN t_user as ui on ui.id = ot.userId
			LEFT JOIN t_driver as di on di.id = ot.driverId
			LEFT JOIN t_car as ci on ci.id= ot.carId
			LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId
			LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
			LEFT JOIN t_line as ll on ll.id = ot.lineId
			) as o
			<where>
			o.isDelete = 1
			<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
			AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
			</if>
			<if test="orderNum != null and orderNum != ''">
			and o.orderNum LIKE CONCAT('%',#{orderNum},'%')
			</if>
			<if test="orderSource != null and orderSource != ''">
			and o.orderSource = #{orderSource}
			</if>
			<if test="userName != null and userName != ''">
			and o.userName LIKE CONCAT('%',#{userName},'%')
			</if>
			<if test="userPhone != null and userPhone != ''">
			and o.userPhone LIKE CONCAT('%',#{userPhone},'%')
			</if>
			<if test="passengers != null and passengers != ''">
			and o.passengers LIKE CONCAT('%',#{passengers},'%')
			</if>
			<if test="passengersPhone != null and passengersPhone != ''">
			and o.passengersPhone LIKE CONCAT('%',#{passengersPhone},'%')
			</if>
			<if test="serverCarModelId != null and serverCarModelId != ''">
			and o.serverCarModelId = #{serverCarModelId}
			</if>
			<if test="driver != null and driver != ''">
			and o.driver LIKE CONCAT('%',#{driver},'%')
			</if>
			<if test="lineId != null and lineId != ''">
			and o.lineId = #{lineId}
			</if>
			<if test="state != null and state != ''">
			and o.state = #{state}
			</if>
			<if test="roleType != null and roleType != '' and roleType == 2">
			and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
			</if>
			<if test="roleType != null and roleType != '' and roleType == 3">
			and o.companyId = #{nowUserId}
			</if>
			<if test="null != abnormal">
			and o.abnormal = #{abnormal}
			</if>
			<if test="null != promotion">
			and o.promotion = #{promotion}
			</if>
			<if test="null != promotionUser and promotionUser!='' ">
			and o.promotionUser =#{promotionUser}
			</if>
			<if test="null != abnormalStatus">
			and o.abnormalStatus = #{abnormalStatus}
			</if>
			</where>
			order by o.id desc
			</select>
			<!--根据条件查询跨城出行订单列表-->
			<select id="getCrossCityOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
			SELECT * FROM (
			@@ -123,6 +189,18 @@
			<if test="roleType != null and roleType != '' and roleType == 3">
			and o.companyId = #{nowUserId}
			</if>
			<if test="null != abnormal">
			and o.abnormal = #{abnormal}
			</if>
			<if test="null != promotion">
			and o.promotion = #{promotion}
			</if>
			<if test="null != promotionUser and promotionUser!='' ">
			and o.promotionUser =#{promotionUser}
			</if>
			<if test="null != abnormalStatus">
			and o.abnormalStatus = #{abnormalStatus}
			</if>
			</where>
			order by o.id desc
			</select>
			@@ -142,7 +220,9 @@
			ui.nickName as userName,ui.phone as userPhone,
			case when ot.payType = 1 then '微信'
			when ot.payType = 2 then '支付宝'
			when ot.payType = 3 then '余额' else '云闪付' end as payTypeStr,
			when ot.payType = 3 then '余额'
			when ot.payType = 4 then '云闪付'
			else '预备金' end as payTypeStr,
			sc.`name` as serverCarModel,
			CONCAT(di.`name`,'-',di.phone) as driver,
			CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
			@@ -237,4 +317,5 @@
			</foreach>
			</if>
			</select>

			</mapper>