点赞评论排序

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderTourDetail.java

 package com.xxfc.platform.order.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import javax.persistence.*;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.List;
+
 
 /**
  * 旅游订单详情
@@ -241,4 +243,7 @@ public class OrderTourDetail implements Serializable {
 	@Column(name = "is_outside")
 	@ApiModelProperty(value = "是否省外 1--省外；0--省内")
 	private Integer isOutside;
+
+	@Transient
+	private List<AppUserVo> userVoList;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -36,7 +37,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.jexl2.MapContext;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -137,11 +137,12 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
      * @return
      */
     public ObjectRestResponse getOrderDetail(String no) {
+
         OrderPageVO orderPageVo = mapper.getOrderDetail(no);
         if(orderPageVo == null) {
-            return ObjectRestResponse.createDefaultFail();
+            return ObjectRestResponse.createFailedResult(3501, "订单不存在");
         }
-
+     if(orderPageVo.getOrderRentVehicleDetail() != null) {
         if(orderPageVo.getStatus() == 4) { //未交车
            List<VehicleUserLicense> vehicleUserLicenses = Lists.newArrayList();
 
@@ -189,9 +190,25 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
             }
             orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
         }
-        RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVo.getOrderRentVehicleDetail().getVehicleId());
-        if(restResponse.getData() != null) {
-            orderPageVo.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
+
+            RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVo.getOrderRentVehicleDetail().getVehicleId());
+            if(restResponse.getData() != null) {
+                orderPageVo.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
+            }
+        }
+        if(orderPageVo.getOrderTourDetail() != null) {
+            List<Integer> ids = Lists.newArrayList();
+            if(orderPageVo.getOrderTourDetail().getTourUserIds().contains(",")) {
+                String[] strings = orderPageVo.getOrderTourDetail().getTourUserIds().split(",");
+                for (int i = 0; i < strings.length; i++) {
+                    ids.add(Integer.parseInt(StringUtils.isNotBlank(strings[i])? strings[i] : "0"));
+                }
+
+            } else {
+                ids.add(Integer.parseInt(orderPageVo.getOrderTourDetail().getTourUserIds()));
+            }
+            List<AppUserVo> list = userFeign.getByUserIds(ids).getData();
+            orderPageVo.getOrderTourDetail().setUserVoList(list);
         }
         return ObjectRestResponse.succ(orderPageVo);
     }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/RedisKey.java

@@ -46,6 +46,11 @@ public class RedisKey {
      */
     public static final String BRANCH_COMPANY_CACHE_ALL = BRANCH_COMPANY_CACHE + ":all";
 
+    /**
+     * 子公司列表缓存key前缀
+     */
+    public static final String BRANCH_COMPANY_CACHE_DETAIL = "cache:CompanyDetail";
+
     /**
      * 车型分类列表缓存key前缀
      */

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

@@ -187,4 +187,9 @@ public class VehicleBookRecord {
     @Transient
     private List<String> endHourList;
 
+    @Transient
+    private String startHour;
+
+    @Transient
+    private String endHour;
 }
\ No newline at end of file

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

@@ -24,6 +24,11 @@ public class VehicleWarningMsg {
      */
     public Integer type;
 
+    /**
+     * 颜色预警：1、红色预警，2、蓝色预警、3、黄色预警
+     */
+    private Integer colorType;
+
     /**
      * 消息类型，详见VehicleMsgStatus
      */

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordDateVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordVo.java

@@ -4,7 +4,9 @@ import com.xxfc.platform.vehicle.entity.VehicleBookHourInfo;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
-public class VehicleBookRecordDateVo extends VehicleBookRecord {
-    VehicleBookHourInfo vehicleBookHourInfo;
+public class VehicleBookRecordVo extends VehicleBookRecord {
+    List<VehicleBookHourInfo> vehicleBookHourInfo;
 }

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

@@ -67,6 +67,10 @@ public class VehicleWarningMsgQueryVo{
     private Date createTime;
 
     private Date updateTime;
+    /**
+     * 颜色预警：1、红色预警，2、蓝色预警、3、黄色预警
+     */
+    private Integer colorType;
 
     VehicleWarningRule vehicleWarningRule;
 }

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

@@ -83,6 +83,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
      * @param id
      * @return
      */
+    @Cache(key= RedisKey.BRANCH_COMPANY_CACHE)
     public CompanyDetail getDetailById(Integer id) {
         BranchCompany branchCompany = this.getById(id);
         CompanyDetail detail = null;

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

@@ -1157,46 +1157,32 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
     public PageDataVO<VehicleAndModelInfoVo> getAllVehicle(VehiclePlanDto vehiclePlanDto) {
         Query query = new Query(vehiclePlanDto);
         PageDataVO<VehicleAndModelInfoVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllVehicle(query.getSuper()));
-        for(VehicleAndModelInfoVo vehicleAndModelInfoVo : pageDataVO.getData()) {
-            //获取时间
-            if(vehicleAndModelInfoVo.getVehicleBookRecord() != null) {
-                for(VehicleBookRecord vehicleBookRecord : vehicleAndModelInfoVo.getVehicleBookRecord()) {
-                    VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
-                    vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
-                    vehicleBookHourInfoDto.setBookRecordId(vehicleBookRecord.getId());
-                    vehicleBookHourInfoDto.setYearMonthDay(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
-                    VehicleBookHourInfo startVehicleBookHourInfo = vehicleBookHourInfoBiz.selectByVehicleAndId(vehicleBookHourInfoDto);
-                    vehicleBookHourInfoDto.setYearMonthDay(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
-                    VehicleBookHourInfo endVehicleBookHourInfo = vehicleBookHourInfoBiz.selectByVehicleAndId(vehicleBookHourInfoDto);
-                    if(startVehicleBookHourInfo != null ) {
-                        String result = Integer.toBinaryString(startVehicleBookHourInfo.getBookedHour());
-                        if(StringUtils.isNotBlank(result)) {
-                                vehicleBookRecord.setStartHourList(getHourList(result));
-                        }
-                    }
-                    if(endVehicleBookHourInfo != null ) {
-                        String result = Integer.toBinaryString(endVehicleBookHourInfo.getBookedHour());
-                        if(StringUtils.isNotBlank(result)) {
-                            vehicleBookRecord.setEndHourList(getHourList(result));
-                        }
-                    }
-                }
-            }
-
-            CompanyDetail partCompany =  branchCompanyBiz.getDetailById(vehicleAndModelInfoVo.getParkBranchCompanyId());
-            if(partCompany != null) {
-                vehicleAndModelInfoVo.setParkCompanyName(partCompany.getName());
-            }
-            CompanyDetail subCompany =  branchCompanyBiz.getDetailById(vehicleAndModelInfoVo.getSubordinateBranch());
-            if(subCompany != null) {
-                vehicleAndModelInfoVo.setSubordinateBranchName(subCompany.getName());
-            }
-            CompanyDetail disCompany =  branchCompanyBiz.getDetailById(vehicleAndModelInfoVo.getExpectDestinationBranchCompanyId());
-            if(disCompany != null) {
-                vehicleAndModelInfoVo.setDestinationBranchCompanyName(disCompany.getName());
-            }
-        }
-
+//        for(VehicleAndModelInfoVo vehicleAndModelInfoVo : pageDataVO.getData()) {
+//            //获取时间
+//            if(vehicleAndModelInfoVo.getVehicleBookRecord() != null) {
+//                for(VehicleBookRecord vehicleBookRecord : vehicleAndModelInfoVo.getVehicleBookRecord()) {
+//                    VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+//                    vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
+//                    vehicleBookHourInfoDto.setBookRecordId(vehicleBookRecord.getId());
+//                    vehicleBookHourInfoDto.setYearMonthDay(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
+//                    VehicleBookHourInfo startVehicleBookHourInfo = vehicleBookHourInfoBiz.selectByVehicleAndId(vehicleBookHourInfoDto);
+//                    vehicleBookHourInfoDto.setYearMonthDay(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
+//                    VehicleBookHourInfo endVehicleBookHourInfo = vehicleBookHourInfoBiz.selectByVehicleAndId(vehicleBookHourInfoDto);
+//                    if(startVehicleBookHourInfo != null ) {
+//                        String result = Integer.toBinaryString(startVehicleBookHourInfo.getBookedHour());
+//                        if(StringUtils.isNotBlank(result)) {
+//                                vehicleBookRecord.setStartHour(result);
+//                        }
+//                    }
+//                    if(endVehicleBookHourInfo != null ) {
+//                        String result = Integer.toBinaryString(endVehicleBookHourInfo.getBookedHour());
+//                        if(StringUtils.isNotBlank(result)) {
+//                            vehicleBookRecord.setEndHour(result);
+//                        }
+//                    }
+//                }
+//            }
+//        }
         return pageDataVO;
     }
 

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

 package com.xxfc.platform.vehicle.biz;
 
+import com.ace.cache.annotation.Cache;
+import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.google.common.collect.Maps;
@@ -26,6 +28,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
 
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
     public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
+
     public static  Map<String, Integer>  getPredictableHours(String bookStartdate, String bookEndDate) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date startDate = null;
@@ -77,11 +80,18 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         return mapper.selectByVehicleAndDate(vehicleBookHourInfoDto);
     }
 
+    @Cache(key = "vehicle.hourInfo")
     public VehicleBookHourInfo selectByVehicleAndId(VehicleBookHourInfoDto vehicleBookHourInfoDto) {
         return mapper.selectByVehicleAndId(vehicleBookHourInfoDto);
     }
 
+    @Cache(key = "vehicle.hourInfo")
+    public List<VehicleBookHourInfo> getAll() {
+        return mapper.selectAll();
+    }
+
     @Transactional
+    @CacheClear(key = "vehicle.hourInfo")
     public ObjectRestResponse save(VehicleBookHourInfoDto vehicleBookHourInfoDto) {
         if(vehicleBookHourInfoDto == null) {
             return ObjectRestResponse.createFailedResult(502, "参数为空");
@@ -111,6 +121,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
      * @return
      */
     @Transactional
+    @CacheClear(key = "vehicle.hourInfo")
     public ObjectRestResponse delete(String vehicleId, List<String> dateList) {
             if(StringUtils.isBlank(vehicleId) || dateList.size() <= 0) {
                 return ObjectRestResponse.createFailedResult(502, "删除信息车辆Id为空");

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookHourInfoMapper.java

@@ -13,4 +13,6 @@ public interface VehicleBookHourInfoMapper extends Mapper<VehicleBookHourInfo> {
     List<VehicleBookHourInfo> selectByVehicleAndDateList(Map<String, Object> param);
 
     VehicleBookHourInfo selectByVehicleAndId(VehicleBookHourInfoDto vehicleBookHourInfoDto);
+
+    List<VehicleBookHourInfo> selectByBookRecordId(Integer bookVehicleId);
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -422,19 +422,39 @@ public class VehicleController extends BaseController<VehicleBiz> {
     @IgnoreClientToken
     @IgnoreUserToken
     public ObjectRestResponse<Map<String, Object>> getVehiclePlanList(VehiclePlanDto vehiclePlanDto) {
-            //获取统计信息
-            List<VehicleCountVo> vehicleCountVos = baseBiz.countVehicleByParam(vehiclePlanDto);
-            //获取警告信息
-            List<VehicleWarningMsgQueryVo> vehicleWarningMsgs = vehicleWarningMsgBiz.getAllByParam(vehiclePlanDto);
             //获取列表
             PageDataVO<VehicleAndModelInfoVo> pageDataVO = baseBiz.getAllVehicle(vehiclePlanDto);
             Map<String, Object> map = Maps.newHashMap();
-            map.put("vehicleCountVos",vehicleCountVos);
-            map.put("vehicleWarningMsgs",vehicleWarningMsgs);
             map.put("vehicleAndModelInfoVo",pageDataVO);
         return ObjectRestResponse.succ(map);
     }
 
+    @RequestMapping(value = "/app/unauth/getVehicleWarningMsg", method = RequestMethod.GET)
+    @ApiOperation(value = "获取排车车辆警告信息")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse<Map<String, Object>> getVehicleWarningMsg(VehiclePlanDto vehiclePlanDto) {
+
+        //获取警告信息
+        List<VehicleWarningMsgQueryVo> vehicleWarningMsgs = vehicleWarningMsgBiz.getAllByParam(vehiclePlanDto);
+        //获取列表
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("vehicleWarningMsgs",vehicleWarningMsgs);
+        return ObjectRestResponse.succ(map);
+    }
+
+    @RequestMapping(value = "/app/unauth/getVehicleTotalMsg", method = RequestMethod.GET)
+    @ApiOperation(value = "获取排车车辆统计信息")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse<Map<String, Object>> getVehicleTotalMsg(VehiclePlanDto vehiclePlanDto) {
+        //获取统计信息
+        List<VehicleCountVo> vehicleCountVos = baseBiz.countVehicleByParam(vehiclePlanDto);
+        //获取列表
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("vehicleCountVos",vehicleCountVos);
+        return ObjectRestResponse.succ(map);
+    }
 
     /**
      * 保存

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

@@ -21,6 +21,10 @@
           select * from vehicle_book_hour_info
           where vehicle_id = #{vehicleId} and book_record_id = #{bookRecordId} and year_month_day = #{yearMonthDay}
       </select>
+    <select id="selectByBookRecordId" parameterType="java.lang.Integer" resultType="com.xxfc.platform.vehicle.entity.VehicleBookHourInfo">
+          select * from vehicle_book_hour_info
+          where book_record_id = #{bookRecordId}
+      </select>
     <select id="selectByVehicleAndDateList" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookHourInfo">
           select * from vehicle_book_hour_info
           where vehicle_id = #{vehicleId} and year_month_day in

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

@@ -6,6 +6,10 @@
          <association property="vehicle" column="vehicle_id" select="com.xxfc.platform.vehicle.mapper.VehicleMapper.selectById" />
     </resultMap>
 
+    <resultMap id="getVehicleHourMap" type="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
+        <association property="vehicleBookHourInfo" column="id" select="com.xxfc.platform.vehicle.mapper.VehicleBookHourInfoMapper.selectByBookRecordId" />
+    </resultMap>
+
   <update id="changeRecordStatus" parameterType="java.util.Map">
     update vehicle_book_record set
     <if test="reviewerApply != null ">
@@ -119,7 +123,8 @@
       mileage_lift,
       mileage_ret,
       have_violation,
-      ret_remark
+      ret_remark,
+      order_no
     )
     values(
             #{id},
@@ -151,7 +156,8 @@
             #{mileageLift},
             #{mileageRet},
             #{haveViolation},
-            #{retRemark}
+            #{retRemark},
+            #{orderNo}
           );
   </insert>
 
@@ -188,7 +194,8 @@
       mileage_lift,
       mileage_ret,
       have_violation,
-      ret_remark
+      ret_remark,
+      order_no
     from
          vehicle_book_record
     where
@@ -233,6 +240,7 @@
             vbr.mileage_ret,
             vbr.have_violation,
             vbr.ret_remark,
+            vbr.order_no,
             v.`code` as vehicleCode,
             v.number_plate as numberPlate,
             v.subordinate_branch,
@@ -324,48 +332,17 @@
             vbr.mileage_lift,
             vbr.mileage_ret,
             vbr.have_violation,
-            vbr.ret_remark
+            vbr.ret_remark,
+            vbr.order_no
          from ${tbName} vbr
         where id = #{id}
 
     </select>
     <select id="getByVehicleId" parameterType="java.lang.String" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord" >
-        select
-            vbr.`id`,
-            vbr.`vehicle_id`,
-            vbr.`status`,
-            vbr.`book_type`,
-            vbr.`book_user`,
-            vbr.`book_user_name`,
-            vbr.`contact_info`,
-            vbr.`book_start_date`,
-            vbr.`book_end_date`,
-            vbr.`lift_location`,
-            vbr.`lift_addr`,
-            vbr.`remark`,
-            vbr.`create_time`,
-            vbr.`update_time`,
-            vbr.`destination`,
-            vbr.`reviewer_apply`,
-            vbr.`reviewer_name_apply`,
-            vbr.`reviewer_return`,
-            vbr.`reviewer_name_return`,
-            vbr.`reviewer_cancel`,
-            vbr.`reviewer_name_cancel`,
-            vbr.`actual_start_date`,
-            vbr.`actual_end_date`,
-            vbr.`reviewer_lift`,
-            vbr.`reviewer_name_lift`,
-            vbr.lift_company,
-            vbr.lift_remark,
-            vbr.ret_company,
-            vbr.mileage_lift,
-            vbr.mileage_ret,
-            vbr.have_violation,
-            vbr.ret_remark
-         from vehicle_book_record vbr
-        where vehicle_id = #{vehicleId}
-
+       SELECT v1.*, conv(v2.booked_hour,10,2) startHour,conv(v3.booked_hour,10,2) endHour from vehicle_book_record v1
+        LEFT JOIN vehicle_book_hour_info v2 on v2.book_record_id = v1.id and YEAR(v2.year_month_day) = YEAR(v1.book_start_date) AND MONTH(v2.year_month_day) = MONTH(v1.book_start_date) AND DAY(v2.year_month_day) =DAY(v1.book_start_date)
+        LEFT JOIN vehicle_book_hour_info v3 on v3.book_record_id = v1.id and YEAR(v3.year_month_day) = YEAR(v1.book_end_date) AND MONTH(v3.year_month_day) = MONTH(v1.book_end_date) AND DAY(v3.year_month_day) =DAY(v1.book_end_date)
+        where v1.vehicle_id = #{vehicleId}
     </select>
     <select id="getByParam" parameterType="java.util.Map" resultMap="getVehicleMap">
         select v1.* from vehicle_book_record v1
@@ -421,6 +398,7 @@
      `ret_remark` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '还车备注',
      `reviewer_lift` int(10) NULL DEFAULT NULL COMMENT '提车审核人',
      `reviewer_name_lift` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提车审核人姓名',
+     `order_no` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '订单号',
      `mileage_lift` int(10) NULL DEFAULT NULL COMMENT '提车里程数',
      `mileage_ret` int(10) NULL DEFAULT NULL COMMENT '还车里程数',
      `have_violation` tinyint(4) NULL DEFAULT NULL COMMENT '是否违章',

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

@@ -421,10 +421,12 @@
         </if>
     </select>
     <select id="getAllVehicle" parameterType="java.util.Map" resultMap="searchModel">
-        select *
+        select v1.*, bc2.name subordinateBranchName, bc3.name parkCompanyName, bc4.name destinationBranchCompanyName
         from vehicle v1
         -- 所属分公司
         LEFT JOIN branch_company bc2 ON v1.subordinate_branch = bc2.id
+        LEFT JOIN branch_company bc3 ON v1.park_branch_company_id = bc3.id
+        LEFT JOIN branch_company bc4 ON v1.expect_destination_branch_company_id = bc4.id
         <where>
             <if test="startTime != null">
                 and v1.create_time between #{startTime} and #{endTime}