Merge remote-tracking branch 'origin/base-modify' into base-modify

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

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

@@ -5,7 +5,6 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 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;
@@ -17,17 +16,15 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
-import com.google.gson.JsonObject;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
-import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
@@ -59,15 +56,14 @@ import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
 
-import java.awt.geom.Point2D;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 import static com.xxfc.platform.universal.constant.DictionaryKey.ILLEGAL_TYPE;
 
@@ -320,7 +316,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
             }
         }
         JSONArray jsonArray = new JSONArray();
-        if (dedDetailDTO.getCost().intValue() != 0 || dedDetailDTO.getExcessCost().intValue() != 0) {
+        if ((dedDetailDTO.getCost() != null && dedDetailDTO.getCost().doubleValue() != 0) || (dedDetailDTO.getExcessCost()!=null && dedDetailDTO.getExcessCost().doubleValue() != 0)) {
             jsonArray.add(dedDetailDTO);
         }
         DedDetailDTO dedDetailDTO1 = new DedDetailDTO();
@@ -361,7 +357,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
                 }
             }
         }
-        if (dedDetailDTO1.getCost().intValue() != 0) {
+        if (dedDetailDTO1.getCost() != null && dedDetailDTO1.getCost().doubleValue() != 0) {
             jsonArray.add(dedDetailDTO1);
         }
         orderPageVO.setDedDetailDTO(jsonArray.toJSONString());

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.biz;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.constant.*;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.*;
@@ -456,6 +457,17 @@ public class VehicleActiveService {
 
     }
 
+    public ObjectRestResponse selectDepartureLogByBookRecordId(Long bookRecordId) {
+        if (bookRecordId == null) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        VehicleDepartureLogVo vehicleDepartureLog = vehicleDepartureLogMapper.selectByBookRecordId(bookRecordId);
+        if (vehicleDepartureLog == null) {
+            return ObjectRestResponse.createFailedResult(ResCode.FIND_DATA_NOT_EXIST.getCode(), ResCode.FIND_DATA_NOT_EXIST.getDesc());
+        }
+        return ObjectRestResponse.succ(vehicleDepartureLog);
+    }
+
 
     public static void main(String[] args) {
         DateTime startDate = DateTime.parse("2019-08-21 17:00:00", DATE_TIME_FORMATTER);

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

@@ -292,30 +292,34 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 for (Vehicle exitsVehicle : exitsVehicles) {
                     if (exitsVehicle.getId().equals(addOrUpdateVehicleVo.getId())) {
                         //如果修改的有停靠分公司，需要添加一条调度记录
-                        if (exitsVehicle.getParkBranchCompanyId() != addOrUpdateVehicleVo.getParkBranchCompanyId()) {
-                            VehicleBookRecord vehicleBookRecord = new VehicleBookRecord();
-                            vehicleBookRecord.setRetCompany(addOrUpdateVehicleVo.getParkBranchCompanyId());
-                            vehicleBookRecord.setLiftCompany(exitsVehicle.getParkBranchCompanyId());
-                            vehicleBookRecord.setRemark("后台修改停靠公司，调度车辆");
-                            vehicleBookRecord.setBookStartDate(new Date());
-                            vehicleBookRecord.setBookEndDate(new Date());
-                            vehicleBookRecord.setActualEndDate(new Date());
-                            vehicleBookRecord.setActualStartDate(new Date());
-                            vehicleBookRecord.setBookUser(userDTO.getId());
-                            vehicleBookRecord.setBookUserName(userDTO.getUsername());
-                            vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
-                            vehicleBookRecord.setBookType(BookType.DISPATCH.getCode());
-                            vehicleBookRecord.setVehicleId(exitsVehicle.getId());
-                            vehicleBookRecord.setVehicleUsername(userDTO.getUsername());
-                            vehicleBookRecord.setVehicleUserPhone(userDTO.getUsername());
-                            ObjectRestResponse objectRestResponse = addVehicleBookRecord(vehicleBookRecord);
-                            if(objectRestResponse.isRel()) {
-                                continue;
-                            } else {
-                                return RestResponse.codeAndMessage(objectRestResponse.getStatus(), objectRestResponse.getMessage());
-                            }
+                        Vehicle vehicle1 = selectById(exitsVehicle.getId());
+                        if (vehicle1 != null) {
+                            if (vehicle1.getParkBranchCompanyId() != addOrUpdateVehicleVo.getParkBranchCompanyId()) {
+                                VehicleBookRecord vehicleBookRecord = new VehicleBookRecord();
+                                vehicleBookRecord.setRetCompany(addOrUpdateVehicleVo.getParkBranchCompanyId());
+                                vehicleBookRecord.setLiftCompany(vehicle1.getParkBranchCompanyId());
+                                vehicleBookRecord.setRemark("后台修改停靠公司，调度车辆");
+                                vehicleBookRecord.setBookStartDate(new Date());
+                                vehicleBookRecord.setBookEndDate(new Date());
+                                vehicleBookRecord.setActualEndDate(new Date());
+                                vehicleBookRecord.setActualStartDate(new Date());
+                                vehicleBookRecord.setBookUser(userDTO.getId());
+                                vehicleBookRecord.setBookUserName(userDTO.getUsername());
+                                vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
+                                vehicleBookRecord.setBookType(BookType.DISPATCH.getCode());
+                                vehicleBookRecord.setVehicleId(vehicle1.getId());
+                                vehicleBookRecord.setVehicleUsername(userDTO.getUsername());
+                                vehicleBookRecord.setVehicleUserPhone(userDTO.getUsername());
+                                ObjectRestResponse objectRestResponse = addVehicleBookRecord(vehicleBookRecord);
+                                if(objectRestResponse.isRel()) {
+                                    continue;
+                                } else {
+                                    return RestResponse.codeAndMessage(objectRestResponse.getStatus(), objectRestResponse.getMessage());
+                                }
 
+                            }
                         }
+
                     }
                     return RestResponse.codeAndMessage(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode(),
                             ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getDesc());

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

@@ -197,51 +197,6 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 3) { //待出行
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query = new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus3(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 5) { //出行中
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query = new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus5(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 7) { //已完成
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query =  new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus7(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
         Query query =  new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         getupKeeps(pageDataVO.getData());
@@ -261,47 +216,6 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
     }
-
-    //筛选未出车的记录
-    public void removeStatus3(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(3);
-            }
-        }
-    }
-
-    //筛选已出车未还车记录
-    public void removeStatus5(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() ==1)) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(5);
-            }
-        }
-    }
-    //筛选已完成记录
-    public void removeStatus7(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() !=1)) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(5);
-            }
-        }
-    }
     /**
      * 获取随身物品
      */
@@ -396,11 +310,10 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                 return ObjectRestResponse.paramIsEmpty();
             }
             save(vehicleBookRecord);
-            VehicleBookRecord newValue = selectOne(vehicleBookRecord);
-            if (newValue != null) {
+            if (vehicleBookRecord != null) {
                 //添加交还车记录
                 VehicleDepartureLog vehicleDepartureLog = new VehicleDepartureLog();
-                vehicleDepartureLog.setBookRecordId(newValue.getId());
+                vehicleDepartureLog.setBookRecordId(vehicleBookRecord.getId());
                 vehicleDepartureLog.setArrivalBranchCompanyId(vehicleBookRecord.getRetCompany());
                 vehicleDepartureLog.setArrivalRemark("后台修改停靠分公司，车辆调度");
                 vehicleDepartureLog.setArrivalTime(new Date());

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

 package com.xxfc.platform.vehicle.rest;
 
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.VehicleActiveService;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.pojo.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 
@@ -91,6 +89,12 @@ public class VehicleActiveController {
     }
 
 
+    @GetMapping("/getOne")
+    public ObjectRestResponse selectByRecordId(Long bookRecordId) {
+        return vehicleActiveService.selectDepartureLogByBookRecordId(bookRecordId);
+    }
+
+
 
     /**
      * 保养

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

@@ -490,15 +490,33 @@
                     #{id}
                 </foreach>)
             </if>
-            <if test="status != null and status != 0 and status != -1 and status != -2">
+            <if test="status != null and status != 0 and status != -1 and status != -2 and status != 3 and status != 5 and status != 7">
                 and v1.status = #{status}
             </if>
+            <if test="status != null and status == 3 ">
+                and v4.id is null and v1.status = 2
+            </if>
+            <if test="status != null and status == 5 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 0
+            </if>
+            <if test="status != null and status == 7 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 1
+            </if>
             <if test="status != null and status == 0 ">
                 and v4.state = 0
             </if>
             <if test="status != null and status == -1 ">
                 and v4.state = 1
             </if>
+            <if test="status != null and status == 3 ">
+                and v4.id is null and v1.status = 2
+            </if>
+            <if test="status != null and status == 5 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 0
+            </if>
+            <if test="status != null and status == 7 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 1
+            </if>
             <if test="code != null">
                 and v3.code = #{code}
             </if>

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

@@ -29,9 +29,11 @@
     </select>
 
     <select id="selectByBookRecordId" parameterType="java.lang.Long" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
-        select vehicle_departure_log.*
-        from vehicle_departure_log
-        where vehicle_departure_log.book_record_id = #{id}
+        select v.*, bc.name as departureName,bc1.name as arrivalName
+        from vehicle_departure_log v
+        LEFT JOIN branch_company bc ON v.departure_branch_company_id = bc.id
+        LEFT JOIN branch_company bc1 ON v.arrival_branch_company_id = bc1.id
+        where v.book_record_id = #{id}
         order by create_time desc
     </select>
     <select id="selectAllDepartureLog" resultType="java.lang.Integer" parameterType="Map">

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

@@ -41,11 +41,10 @@
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
-        v.`status`,
+        (CASE WHEN #{status} != 0 THEN #{status}
+        ELSE v.status END) status ,
         v.number_plate,
         v.brand,
-        -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
-        -- IFNULL(bc.name,bc1.name) AS subBranchName,
         v.park_branch_company_id,
         bc.name as parkBranchCompanyName,
         v.expect_destination_branch_company_id,
@@ -81,15 +80,13 @@
             left join
             vehicle_book_info vbi on v.`id` = vbi.vehicle
         </if>
-        -- LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
-        -- LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         -- 停车分公司
         LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
         -- 目的地分公司
         LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         -- 所属分公司
         LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
-        LEFT JOIN vehicle_book_record v2 on v2.vehicle_id = v.id
+        LEFT JOIN vehicle_book_record v2 on v2.id = (select id from vehicle_book_record where vehicle_id = v.id order by update_time DESC LIMIT 1)
         LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
         LEFT JOIN vehicle_model vm ON  v.model_id = vm.id
         where
@@ -118,15 +115,15 @@
         <if test="insuranceCompany !=null">
             and v.insurance_company = #{insuranceCompany}
         </if>
-        <if test="belongToName !=null">
-            and v.belong_to_name = #{belongToName}
+        <if test="belongToName !=null and belongToName != ''">
+            and v.belong_to_name  like concat('%',#{belongToName},'%')
         </if>
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}
         </if>
-<!--        <if test="subordinateBranch !=null">-->
-<!--            and v.subordinate_branch = #{subordinateBranch}-->
-<!--        </if>-->
+        <!--        <if test="subordinateBranch !=null">-->
+        <!--            and v.subordinate_branch = #{subordinateBranch}-->
+        <!--        </if>-->
         <if test="code !=null">
             and v.code = #{code}
         </if>
@@ -166,17 +163,16 @@
             and ( v.park_branch_company_id = #{subordinateBranch})
         </if>
         <if test=" addrProvince !=null or addrCity !=null or zoneId !=null ">
-                <if test="addrProvince !=null">
-                    and bc.addr_province=#{addrProvince}
-                </if>
-                <if test="addrCity !=null">
-                   and  bc.addr_city=#{addrCity}
-                </if>
-                <if test="zoneId !=null">
-                   and  bc.zone_id=#{zoneId}
-                </if>
+            <if test="addrProvince !=null">
+                and bc.addr_province=#{addrProvince}
+            </if>
+            <if test="addrCity !=null">
+                and  bc.addr_city=#{addrCity}
+            </if>
+            <if test="zoneId !=null">
+                and  bc.zone_id=#{zoneId}
+            </if>
         </if>
-        order by v.code
         ) r ORDER BY r.parkBranchCompanyName
     </select>
 
@@ -185,7 +181,8 @@
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
-        v.`status`,
+        (CASE WHEN #{status} != 0 THEN #{status}
+        ELSE v.status END) status ,
         v.number_plate,
         v.brand,
         -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
@@ -231,30 +228,32 @@
         LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         -- 所属分公司
         LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
+        LEFT JOIN vehicle_book_record v2 on v2.id = (select id from vehicle_book_record where vehicle_id = v.id order by update_time DESC LIMIT 1)
+        LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
         LEFT JOIN vehicle_model vm ON  v.model_id = vm.id
         where
         v.is_del=0
         <if test="companyList != null">
             and ( v.park_branch_company_id in (
-                <trim suffixOverrides=",">
-                    <foreach collection="companyList" item="companyId">
-                        #{companyId},
-                    </foreach>
-                </trim>
-                )
-                <!--or v.expect_destination_branch_company_id in (
-                <trim suffixOverrides=",">
-                    <foreach collection="companyList" item="companyId">
-                        #{companyId},
-                    </foreach>
-                </trim>
-                )-->
-    <!--            or v.subordinate_branch in (-->
-    <!--            <trim suffixOverrides=",">-->
-    <!--                <foreach collection="companyList" item="companyId">-->
-    <!--                    #{companyId},-->
-    <!--                </foreach>-->
-    <!--            </trim>-->
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="companyId">
+                    #{companyId},
+                </foreach>
+            </trim>
+            )
+            <!--or v.expect_destination_branch_company_id in (
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="companyId">
+                    #{companyId},
+                </foreach>
+            </trim>
+            )-->
+            <!--            or v.subordinate_branch in (-->
+            <!--            <trim suffixOverrides=",">-->
+            <!--                <foreach collection="companyList" item="companyId">-->
+            <!--                    #{companyId},-->
+            <!--                </foreach>-->
+            <!--            </trim>-->
             )
         </if>
         <if test="mRangeDateEnd !=null">
@@ -281,21 +280,27 @@
         <if test="insuranceCompany !=null">
             and v.insurance_company = #{insuranceCompany}
         </if>
-        <if test="belongToName !=null">
-            and v.belong_to_name = #{belongToName}
+        <if test="belongToName !=null and belongToName != ''">
+            and v.belong_to_name like concat('%',#{belongToName},'%')
         </if>
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}
         </if>
-<!--        <if test="subordinateBranch !=null">-->
-<!--            and v.subordinate_branch = #{subordinateBranch}-->
-<!--        </if>-->
+        <!--        <if test="subordinateBranch !=null">-->
+        <!--            and v.subordinate_branch = #{subordinateBranch}-->
+        <!--        </if>-->
         <if test="code !=null">
             and v.code = #{code}
         </if>
-        <if test="status !=null">
+        <if test="status !=null and status != 6 and status != 7">
             and v.status = #{status}
         </if>
+        <if test="status !=null and status == 6">
+            and  v3.id is not NULL and v2.book_type = 3 and v3.state = 0
+        </if>
+        <if test="status !=null and status == 7">
+            and  v3.id is not NULL and v2.book_type = 6 and v3.state = 0
+        </if>
         <if test="numberPlate !=null and numberPlate != ''">
             and v.number_plate like concat('%',#{numberPlate},'%')
         </if>
@@ -333,7 +338,6 @@
                 and  bc.zone_id=#{zoneId}
             </if>
         </if>
-        order by v.code
         ) r ORDER BY r.parkBranchCompanyName
     </select>