java/IgoTravel.git

			@@ -8,8 +8,10 @@
			<result column="account" property="account" />
			<result column="jobNumber" property="jobNumber" />
			<result column="phone" property="phone" />
			<result column="phoneOperator" property="phoneOperator" />
			<result column="password" property="password" />
			<result column="name" property="name" />
			<result column="lastName" property="lastName" />
			<result column="firstName" property="firstName" />
			<result column="sex" property="sex" />
			<result column="idCard" property="idCard" />
			<result column="companyId" property="companyId" />
			@@ -31,7 +33,8 @@
			<result column="driverContactAddress" property="driverContactAddress" />
			<result column="driverAge" property="driverAge" />
			<result column="driveCard" property="driveCard" />
			<result column="driveCardImgUrl" property="driveCardImgUrl" />
			<result column="driveCardImgUrl1" property="driveCardImgUrl1" />
			<result column="driveCardImgUrl2" property="driveCardImgUrl2" />
			<result column="driverType" property="driverType" />
			<result column="getDriverLicenseDate" property="getDriverLicenseDate" />
			<result column="driverLicenseOn" property="driverLicenseOn" />
			@@ -67,6 +70,7 @@
			<result column="laveBusinessMoney" property="laveBusinessMoney" />
			<result column="laveBusinessMoney" property="laveBusinessMoney" />
			<result column="appletsOpenId" property="appletsOpenId"/>
			<result column="email" property="email"/>


			<result column="flag" property="flag"/>
			@@ -84,8 +88,10 @@
			account as account,
			jobNumber as jobNumber,
			phone as phone,
			phoneOperator as phoneOperator,
			password as password,
			name as name,
			lastName as lastName,
			firstName as firstName,
			sex as sex,
			idCard as idCard,
			companyId as companyId,
			@@ -107,7 +113,8 @@
			driverContactAddress as driverContactAddress,
			driverAge as driverAge,
			driveCard as driveCard,
			driveCardImgUrl as driveCardImgUrl,
			driveCardImgUrl1 as driveCardImgUrl1,
			driveCardImgUrl2 as driveCardImgUrl2,
			driverType as driverType,
			getDriverLicenseDate as getDriverLicenseDate,
			driverLicenseOn as driverLicenseOn,
			@@ -166,13 +173,16 @@


			<select id="queryIdleDriver_" resultType="Driver">
			select * from (
			select
			id as id,
			account as account,
			jobNumber as jobNumber,
			phone as phone,
			phoneOperator as phoneOperator,
			password as password,
			name as name,
			lastName as lastName,
			firstName as firstName,
			sex as sex,
			idCard as idCard,
			companyId as companyId,
			@@ -194,7 +204,8 @@
			driverContactAddress as driverContactAddress,
			driverAge as driverAge,
			driveCard as driveCard,
			driveCardImgUrl as driveCardImgUrl,
			driveCardImgUrl1 as driveCardImgUrl1,
			driveCardImgUrl2 as driveCardImgUrl2,
			driverType as driverType,
			getDriverLicenseDate as getDriverLicenseDate,
			driverLicenseOn as driverLicenseOn,
			@@ -248,10 +259,16 @@
			)
			and id in (select driverId from t_driver_orders where `type` = #{type})
			and carId in (select carId from t_car_service where `type` = #{type}

			<if test="null != serverCarModelId">
			and serverCarModelId = #{serverCarModelId}
			</if>
			)
			) as aa <!--where aa.id not in (
			select driverId from t_order_private_car where isDelete = 1 and driverPay = 1 and state in (7, 8, 9)
			union all
			select driverId from t_order_logistics where isDelete = 1 and driverPay = 1 and state != 10
			)-->
			</select>


			@@ -261,7 +278,7 @@
			b.id as orderId,
			b.state as state,
			a.id as driverId,
			a.`name` as `name`,
			CONCAT(a.firstName, " ", a.lastName) as `name`,
			a.headImgUrl as avatar,
			case when b.telX is null then a.phone else b.telX end as phone,
			c.carLicensePlate as carCode,
			@@ -303,12 +320,12 @@
			select
			a.id as id,
			a.headImgUrl as avatar,
			a.`name` as `name`,
			CONCAT(a.firstName, " ", a.lastName) as `name`,
			a.phone as phone,
			a.idCard as idcode,
			b.carLicensePlate as licensePlate,
			b.carColor as carColor,
			CONCAT(d.`name`, c.`name`) as brand,
			CONCAT(d.`name`, " ", c.`name`) as brand,
			if((select count(id) from t_driver_work where state = 1 and driverId = a.id) = 0, 1, if(
			(
			(select count(id) from t_order_private_car where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id) +
			@@ -332,7 +349,7 @@
			select
			id as id,
			phone as phone,
			name as name,
			CONCAT(firstName, " ", lastName) as name,
			headImgUrl as avatar,
			DATE_FORMAT(insertTime,'%Y/%m/%d %H:%i') as insertTime
			from