java/NTTravel.git

			@@ -82,10 +82,11 @@
			SELECT
			GROUP_CONCAT(case when type = 1 then '专车'
			when type = 2 then '出租车'
			when type = 3 then '直通车'
			when type = 3 then '跨城'
			when type = 4 then '小件物流-同城'
			when type = 5 then '小件物流-跨城'
			when type = 6 then '包车'
			when type = 7 then '接送机'
			else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
			) as o
			<where>
			@@ -124,10 +125,11 @@
			SELECT
			GROUP_CONCAT(case when type = 1 then '专车'
			when type = 2 then '出租车'
			when type = 3 then '直通车'
			when type = 3 then '跨城'
			when type = 4 then '小件物流-同城'
			when type = 5 then '小件物流-跨城'
			when type = 6 then '包车'
			when type = 7 then '接送机'
			else '' end SEPARATOR '、') as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
			where dd.id = #{driverId}
			</select>
			@@ -143,10 +145,11 @@
			SELECT
			GROUP_CONCAT(case when type = 1 then '专车'
			when type = 2 then '出租车'
			when type = 3 then '直通车'
			when type = 3 then '跨城'
			when type = 4 then '小件物流-同城'
			when type = 5 then '小件物流-跨城'
			when type = 6 then '包车'
			when type = 7 then '接送机'
			else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
			LEFT JOIN (SELECT IFNULL(SUM(fraction)/COUNT(id),0) as evaluateNum,driverId FROM t_order_evaluate GROUP BY driverId) as oe on oe.driverId = dd.id
			LEFT JOIN (SELECT COUNT(id) as taxiNum,driverId FROM t_order_taxi where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot1 on ot1.driverId = dd.id
			@@ -207,10 +210,11 @@
			SELECT
			GROUP_CONCAT(case when type = 1 then '专车'
			when type = 2 then '出租车'
			when type = 3 then '直通车'
			when type = 3 then '跨城'
			when type = 4 then '小件物流-同城'
			when type = 5 then '小件物流-跨城'
			when type = 6 then '包车'
			when type = 7 then '接送机'
			else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = ci.id) as o
			<where>
			o.state = 1
			@@ -271,10 +275,11 @@
			SELECT
			GROUP_CONCAT(case when type = 1 then '专车'
			when type = 2 then '出租车'
			when type = 3 then '直通车'
			when type = 3 then '跨城'
			when type = 4 then '小件物流-同城'
			when type = 5 then '小件物流-跨城'
			when type = 6 then '包车'
			when type = 7 then '接送机'
			else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
			LEFT JOIN (SELECT IFNULL(SUM(fraction)/COUNT(id),0) as evaluateNum,driverId FROM t_order_evaluate GROUP BY driverId) as oe on oe.driverId = dd.id
			LEFT JOIN (SELECT COUNT(id) as taxiNum,driverId FROM t_order_taxi where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot1 on ot1.driverId = dd.id