小程序申请用车添加取|还分公司

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleUserReserve.java

@@ -62,6 +62,8 @@ public class VehicleUserReserve {
     @ApiModelProperty("分公司id")
     private Integer companyId;
 
+    @Column(name = "arrival_companyId")
+    private Integer arrivalCompanyId;
 
     @Column(name = "crt_time")
     @ApiModelProperty("创建时间")

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

@@ -16,4 +16,12 @@ public class VehicleUserReserveVo extends VehicleUserReserve {
 
     @ApiModelProperty("车型名称")
     private String modelName;
+    /**
+     * 取车分公司
+     */
+    private String companyName;
+    /**
+     * 还车分公司
+     */
+    private String arrivalCompanyName;
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleUserReserveBiz.java

@@ -43,9 +43,4 @@ public class VehicleUserReserveBiz extends BaseBiz<VehicleUserReserveMapper, Veh
         insertSelective(userReserve);
         return  ObjectRestResponse.succ();
     }
-
-
-
-
-
 }

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

@@ -17,12 +17,17 @@
         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.`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
         <where>
             r.is_del=0
         </where>