Browse Source

[CODE]: 车辆添加 驾驶员电话

maxianghua 4 years ago
parent
commit
f56f6801e7

+ 18 - 4
ruoyi-fleet/src/main/java/com/ruoyi/basicData/domain/FleetCarManage.java

@@ -1,12 +1,12 @@
 package com.ruoyi.basicData.domain;
 
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 车辆对象 fleet_car_manage
@@ -47,6 +47,12 @@ public class FleetCarManage extends BaseEntity {
     private String driverName;
 
     /**
+     * 驾驶员
+     */
+    @Excel(name = "驾驶员电话")
+    private String driverTel;
+
+    /**
      * 挂号
      */
     @Excel(name = "挂号")
@@ -294,6 +300,14 @@ public class FleetCarManage extends BaseEntity {
         return driverName;
     }
 
+    public String getDriverTel() {
+        return driverTel;
+    }
+
+    public void setDriverTel(String driverTel) {
+        this.driverTel = driverTel;
+    }
+
     public void setHangNum(String hangNum) {
         this.hangNum = hangNum;
     }

+ 7 - 1
ruoyi-fleet/src/main/resources/mapper/basicData/FleetCarManageMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="carNum"    column="car_num"    />
         <result property="driverId"    column="driver_id"    />
         <result property="driverName"    column="driver_name"    />
+        <result property="driverTel"    column="driver_tel"    />
         <result property="hangNum"    column="hang_num"    />
         <result property="fuelType"    column="fuel_type"    />
         <result property="carType"    column="car_type"    />
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFleetCarManageVo">
-        select id, fleet_company_id, car_num, driver_id, driver_name, hang_num, fuel_type, car_type, car_name, car_brand, manufacture_unit, office_of_certificate, pull_car_type, pull_car_shelf_num, mount_car_type, mount_car_num, engine, car_load_persion, buy_car_date, regiest_date, abandon_date, outer_size, sum_weight, vouch_weight, equip_weight, driving_license_src, driving_pendant_src, operation_license_src, technology_src, driving_load_src, second_lv_maintain_src, taffic_constranint_insurance_src, business_insurance_src, accpet_carrage_insurance_src, creat_time, modification_time, bill_status, del_flag, create_by, update_by, update_time, remarks from fleet_car_manage
+        select id, fleet_company_id, car_num, driver_id, driver_name,driver_tel, hang_num, fuel_type, car_type, car_name, car_brand, manufacture_unit, office_of_certificate, pull_car_type, pull_car_shelf_num, mount_car_type, mount_car_num, engine, car_load_persion, buy_car_date, regiest_date, abandon_date, outer_size, sum_weight, vouch_weight, equip_weight, driving_license_src, driving_pendant_src, operation_license_src, technology_src, driving_load_src, second_lv_maintain_src, taffic_constranint_insurance_src, business_insurance_src, accpet_carrage_insurance_src, creat_time, modification_time, bill_status, del_flag, create_by, update_by, update_time, remarks from fleet_car_manage
     </sql>
 
     <select id="selectFleetCarManageList" parameterType="FleetCarManage" resultMap="FleetCarManageResult">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNum != null  and carNum != ''"> and car_num = #{carNum}</if>
             <if test="driverId != null "> and driver_id = #{driverId}</if>
             <if test="driverName != null  and driverName != ''"> and driver_name like concat('%', #{driverName}, '%')</if>
+            <if test="driverTel != null "> and driver_tel like concat('%', #{driverTel}, '%')</if>
             <if test="hangNum != null  and hangNum != ''"> and hang_num = #{hangNum}</if>
             <if test="fuelType != null  and fuelType != ''"> and fuel_type = #{fuelType}</if>
             <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
@@ -103,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNum != null  and carNum != ''"> and car_num = #{carNum}</if>
             <if test="driverId != null "> and driver_id = #{driverId}</if>
             <if test="driverName != null  and driverName != ''"> and driver_name like concat('%', #{driverName}, '%')</if>
+            <if test="driverTel != null  and driverTel != ''"> and driver_tel like concat('%', #{driverTel}, '%')</if>
             <if test="hangNum != null  and hangNum != ''"> and hang_num = #{hangNum}</if>
             <if test="fuelType != null  and fuelType != ''"> and fuel_type = #{fuelType}</if>
             <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
@@ -151,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNum != null">car_num,</if>
             <if test="driverId != null">driver_id,</if>
             <if test="driverName != null">driver_name,</if>
+            <if test="driverTel != null">driver_tel ,</if>
             <if test="hangNum != null">hang_num,</if>
             <if test="fuelType != null">fuel_type,</if>
             <if test="carType != null">car_type,</if>
@@ -194,6 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNum != null">#{carNum},</if>
             <if test="driverId != null">#{driverId},</if>
             <if test="driverName != null">#{driverName},</if>
+            <if test="driverTel != null">#{driverTel},</if>
             <if test="hangNum != null">#{hangNum},</if>
             <if test="fuelType != null">#{fuelType},</if>
             <if test="carType != null">#{carType},</if>
@@ -241,6 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNum != null">car_num = #{carNum},</if>
             <if test="driverId != null">driver_id = #{driverId},</if>
             <if test="driverName != null">driver_name = #{driverName},</if>
+            <if test="driverTel != null">driver_tel = #{driverTel},</if>
             <if test="hangNum != null">hang_num = #{hangNum},</if>
             <if test="fuelType != null">fuel_type = #{fuelType},</if>
             <if test="carType != null">car_type = #{carType},</if>