Merge remote-tracking branch 'origin/dev' into dev

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehicleUserReserveVo.java

@@ -20,8 +20,15 @@ public class VehicleUserReserveVo extends VehicleUserReserve {
      * 取车分公司
      */
     private String companyName;
+    private String companyAddress;
     /**
      * 还车分公司
      */
     private String arrivalCompanyName;
+    private String arrivalcompanyAddress;
+
+    /**
+     * 车辆图片
+     */
+    private String vehiclePic;
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleUserReserveMapper.xml

@@ -6,28 +6,32 @@
     <select id="getList"   parameterType="com.xxfc.platform.vehicle.pojo.dto.VehicleUserReserveDTO" resultType="com.xxfc.platform.vehicle.pojo.vo.VehicleUserReserveVo">
         SELECT
         r.id,
-        r.user_id as userId,
-        r.mode_id as modeId,
+        r.user_id AS userId,
+        r.mode_id AS modeId,
         r.`name`,
         r.phone,
-        r.start_time as startTime,
-        r.end_time as endTime,
-        r.addr_province as addrProvince,
-        r.province_name as provinceName,
-        r.addr_city as addrCity,
-        r.city_name as cityName,
-        r.company_id as companyId,
-        r.arrival_companyId as arrivalCompanyId,
-        bct.name as `companyName`,
-        bcr.name as `arrivalCompanyName`,
-        r.crt_time as crtTime,
-        r.upd_time as updTime,
+        r.start_time AS startTime,
+        r.end_time AS endTime,
+        r.addr_province AS addrProvince,
+        r.province_name AS provinceName,
+        r.addr_city AS addrCity,
+        r.city_name AS cityName,
+        r.company_id AS companyId,
+        CONCAT(bct.province_name,bct.city_name,bct.town_name,bct.addr_detail) AS `companyAddress`,
+        r.arrival_companyId AS arrivalCompanyId,
+        CONCAT(bcr.province_name,bcr.city_name,bcr.town_name,bcr.addr_detail) AS `arrivalcompanyAddress`,
+        bct.NAME AS `companyName`,
+        bcr.NAME AS `arrivalCompanyName`,
+        r.crt_time AS crtTime,
+        r.upd_time AS updTime,
         r.`status`,
-        m.`name` as modelName
-        FROM vehicle_user_reserve r
-        LEFT JOIN vehicle_model m  ON r.mode_id=m.id
-        LEFT JOIN `branch_company` AS `bct` ON bct.id=r.company_Id
-        LEFT JOIN `branch_company` as `bcr` ON bcr.id=r.arrival_companyId
+        m.`name` AS modelName,
+        m.`cover_pic` AS `vehiclePic`
+        FROM
+        vehicle_user_reserve r
+        LEFT JOIN vehicle_model m ON r.mode_id = m.id
+        LEFT JOIN `branch_company` AS `bct` ON bct.id = r.company_Id
+        LEFT JOIN `branch_company` AS `bcr` ON bcr.id = r.arrival_companyId
         <where>
             r.is_del=0
         </where>