java/IgoTravel.git

			@@ -45,6 +45,7 @@
			<result column="GPSInstallDate" property="GPSInstallDate"/>
			<result column="registerDate" property="registerDate"/>
			<result column="commercialType" property="commercialType"/>
			<result column="driverId" property="driverId"/>
			</resultMap>

			<!-- 通用查询结果列 -->
			@@ -62,11 +63,7 @@
			LEFT JOIN (
			SELECT
			GROUP_CONCAT(case when type = 1 then '专车'
			when type = 2 then '出租车'
			when type = 3 then '跨城出行'
			when type = 4 then '小件物流-同城'
			when type = 5 then '小件物流-跨城'
			when type = 6 then '包车'
			when type = 4 then '市内小件物流'
			else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
			LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
			<where>
			@@ -119,11 +116,7 @@
			LEFT JOIN (
			SELECT
			GROUP_CONCAT(case when type = 1 then '专车'
			when type = 2 then '出租车'
			when type = 3 then '跨城出行'
			when type = 4 then '小件物流-同城'
			when type = 5 then '小件物流-跨城'
			when type = 6 then '包车'
			when type = 4 then '市内小件物流'
			else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
			LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
			<where>
			@@ -178,11 +171,7 @@
			LEFT JOIN (
			SELECT
			GROUP_CONCAT(case when type = 1 then '专车'
			when type = 2 then '出租车'
			when type = 3 then '跨城出行'
			when type = 4 then '小件物流-同城'
			when type = 5 then '小件物流-跨城'
			when type = 6 then '包车'
			when type = 4 then '市内小件物流'
			else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
			LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
			<where>