igo出行
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-07-24 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml


@@ -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" />


@@ -74,7 +76,7 @@




    <!-- 通用查询结果列 -->


    <sql id="Base_Column_List">


        id, account, jobNumber, phone, password, name, sex, idCard, companyId, headImgUrl, faceImgUrl, idCardImgUrl1, idCardImgUrl2, placeOfEmployment, birthday, bankCardNumber, driverNationality, driverNation, driverMaritalStatus, driverLanguageLevel, driverEducation, driverCensus, driverAddress, driverContactAddress, licenseCode, licenselImgUrl, driverAge, driveCard, driveCardImgUrl, driverType, getDriverLicenseDate, driverLicenseOn, driverLicenseOff, taxiDriver, taxiAptitudeCard, networkCarlssueImg, networkCarlssueOrganization, networkCarlssueDate, getNetworkCarProofDate, networkCarProofOn, networkCarProofOff, registerDate, fullTimeDriver, inDriverBlacklist, commercialType, contractCompany, contractOn, contractOff, emergencyContact, emergencyContactPhone, emergencyContactAddress, remark, isPlatCar, carId, authState, state, flag, insertTime, insertUser, updateTime, updateUser, addType,uid,teamId


        id, account, jobNumber, phone, phoneOperator, password, lastName, firstName, sex, idCard, companyId, headImgUrl, faceImgUrl, idCardImgUrl1, idCardImgUrl2, placeOfEmployment, birthday, bankCardNumber, driverNationality, driverNation, driverMaritalStatus, driverLanguageLevel, driverEducation, driverCensus, driverAddress, driverContactAddress, licenseCode, licenselImgUrl, driverAge, driveCard, driveCardImgUrl, driverType, getDriverLicenseDate, driverLicenseOn, driverLicenseOff, taxiDriver, taxiAptitudeCard, networkCarlssueImg, networkCarlssueOrganization, networkCarlssueDate, getNetworkCarProofDate, networkCarProofOn, networkCarProofOff, registerDate, fullTimeDriver, inDriverBlacklist, commercialType, contractCompany, contractOn, contractOff, emergencyContact, emergencyContactPhone, emergencyContactAddress, remark, isPlatCar, carId, authState, state, flag, insertTime, insertUser, updateTime, updateUser, addType,uid,teamId


    </sql>




    <!--根据条件查询待审核司机列表-->


@@ -163,7 +165,7 @@


                and o.phone  LIKE CONCAT('%',#{phone},'%')


            </if>


            <if test="name != null and name != ''">


                and o.name  LIKE CONCAT('%',#{name},'%')


                and o.lastName  LIKE CONCAT('%',#{name},'%') or o.firstName  LIKE CONCAT('%',#{name},'%')


            </if>


            <if test="addType != null and addType != ''">


                and o.addType = #{addType}


@@ -293,7 +295,7 @@


        select


        concat('user_',id) as id,


        phone as phone,


        IFNULL(name,nickName) as name,


        IFNULL(CONCAT(firstName, ' ', lastName),nickName) as name,


        1 as uType,


        insertTime as insertTime


        from t_user


@@ -303,7 +305,7 @@


        select


        concat('driver_',id) as id,


        phone as phone,


        name as name,


        CONCAT(firstName, " ", lastName) as name,


        2 as uType,


        insertTime as insertTime


        from


@@ -320,7 +322,7 @@


    <select id="queryDriverIncomeData" parameterType="com.baomidou.mybatisplus.plugins.Page" resultType="map">


        SELECT


            td.id as id,


            td.`name` as driverName,


            CONCAT(td.firstName, " ", td.lastName) as driverName,


            tc1.name as companyName,


            tc2.name as franchiseeName,


            <if test="1 == type">


@@ -379,7 +381,7 @@


    <select id="queryDriverIncomeDataNoPage"  resultType="map">


        SELECT


        td.id as id,


        td.`name` as driverName,


        CONCAT(td.firstName, " ", td.lastName) as driverName,


        tc1.name as companyName,


        tc2.name as franchiseeName,


        <if test="1 == type">