Merge branch 'master' of http://113.105.137.151:22280/youjj/cloud-platform

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

@@ -115,8 +115,10 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
             if(depositRefundRecord.getStatus() == DepositRefundStatus.VIOLATIONARRIVAL.getCode()) {
                 Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
                 Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
-                depositRefundRecord.setRentDepositAutoRefundTime(depositRefundRecord.getCrtTime() + (rentDepositAutoRefundTime == null?0:rentDepositAutoRefundTime*60*60*1000));
-
+                if(rentDepositAutoRefundTime != null) {
+                    Long time = Long.parseLong(rentDepositAutoRefundTime + "");
+                    depositRefundRecord.setRentDepositAutoRefundTime(depositRefundRecord.getCrtTime() + time * 60 * 60 * 1000);
+                }
             }
         }
         return list;

xx-order/xx-order-server/src/main/resources/bootstrap.yml

@@ -13,7 +13,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848, 10.1.37.166:8848
+        server-addr: 127.0.0.1:8848
         #共用配置，+ mongodb日志配置
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
 

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

@@ -45,15 +45,15 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date startDate = null;
         Date endDate = null;
-        try{
+        try {
             startDate = simpleDateFormat.parse(bookStartDate);
             endDate = simpleDateFormat.parse(bookEndDate);
-        }catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
         //判定时间是否合法
-        if(!Boolean.TRUE.equals(notCheckTimeLegal)) {
+        if (!Boolean.TRUE.equals(notCheckTimeLegal)) {
             if (bookStartDate.compareTo(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER)) < 0) {
                 throw new BaseException(ResultCode.ONLY_BOOK_FROM_TODAY);
             }
@@ -78,17 +78,17 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         }
         DateTime startDay = DateTime.parse(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
         DateTime endDay = DateTime.parse(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
-        if(startPredictableHour == 0) { //如果是0点就直接预订全天
+        if (startPredictableHour == 0) { //如果是0点就直接预订全天
             startPredictableHour = 16777215;
         }
-        if(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER).equals(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER))) {//同一天预定
+        if (DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER).equals(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER))) {//同一天预定
             //如果开始时间是0点开始
             predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour & endPredictableHour);
         } else { //非同一天开始
             predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour);
             predictableHours.put(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), endPredictableHour);
         }
-        if(endDay.getMillis() - startDay.getMillis() > 24 * 3600 * 1000 ){ //
+        if (endDay.getMillis() - startDay.getMillis() > 24 * 3600 * 1000) { //
             for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
                 String curDateStr = curDate.toString(DATE_TIME_FORMATTER);
                 //全天预定
@@ -115,14 +115,14 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     @Transactional
     @CacheClear(key = "vehicle.hourInfo")
     public ObjectRestResponse save(VehicleBookHourInfoDto vehicleBookHourInfoDto) {
-        if(vehicleBookHourInfoDto == null) {
+        if (vehicleBookHourInfoDto == null) {
             return ObjectRestResponse.paramIsEmpty();
         }
         List<VehicleBookHourInfo> vehicleBookHourInfos = mapper.selectByVehicleAndDate(vehicleBookHourInfoDto);
         //有数据直接更新
-        if(vehicleBookHourInfos.size() >=1) {
-            for(VehicleBookHourInfo vehicleBookHourInfo : vehicleBookHourInfos) {
-                if(vehicleBookHourInfo.getBookedHour().equals(vehicleBookHourInfoDto.getBookedHour())) {
+        if (vehicleBookHourInfos.size() >= 1) {
+            for (VehicleBookHourInfo vehicleBookHourInfo : vehicleBookHourInfos) {
+                if (vehicleBookHourInfo.getBookedHour().equals(vehicleBookHourInfoDto.getBookedHour())) {
                     return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_IS_BOOKED_TODAY.getCode(), ResCode.VEHICLE_IS_BOOKED_TODAY.getDesc());
                 } else {
                     vehicleBookHourInfo.setBookedHour(vehicleBookHourInfo.getBookedHour() | vehicleBookHourInfoDto.getBookedHour());
@@ -138,6 +138,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
 
     /**
      * 删除预定车辆小时记录信息
+     *
      * @param vehicleId 车辆Id
      * @param dateList  日期列表
      * @return
@@ -145,7 +146,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     @Transactional
     @CacheClear(key = "vehicle.hourInfo")
     public ObjectRestResponse delete(String vehicleId, List<String> dateList) {
-        if(StringUtils.isBlank(vehicleId) || dateList.size() <= 0) {
+        if (StringUtils.isBlank(vehicleId) || dateList.size() <= 0) {
             return ObjectRestResponse.paramIsEmpty();
         }
         Map<String, Object> param = Maps.newHashMap();
@@ -159,12 +160,12 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     public ObjectRestResponse checkBookHourInfo() {
         List<VehicleBookHourInfoDto> vehicleBookHourInfos = new ArrayList<>();
         List<VehicleBookRecord> list = vehicleBookRecordBiz.selectListAll();
-        if(CollectionUtils.isNotEmpty(list)) {
-            for(VehicleBookRecord vehicleBookRecord : list) {
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (VehicleBookRecord vehicleBookRecord : list) {
                 VehicleDepartureLogVo vehicleDepartureLog = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
-                if((vehicleDepartureLog == null || vehicleDepartureLog.getState() != 1) && (vehicleBookRecord.getStatus() == 2 || vehicleBookRecord.getStatus() == 1)) { //未出车或未还车
+                if ((vehicleDepartureLog == null || vehicleDepartureLog.getState() != 1) && (vehicleBookRecord.getStatus() == 2 || vehicleBookRecord.getStatus() == 1)) { //未出车或未还车
                     Map<String, Integer> map = getPredictableHours(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER), new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER), Boolean.TRUE);
-                    for(Map.Entry<String, Integer> entry : map.entrySet()) {
+                    for (Map.Entry<String, Integer> entry : map.entrySet()) {
                         VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
                         vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
                         vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
@@ -204,10 +205,10 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     }
 
 
-    public static void main(String[] args) throws Exception{
+    public static void main(String[] args) throws Exception {
         VehicleBookHourInfoBiz vehicleBookHourInfoBiz = new VehicleBookHourInfoBiz();
         Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours("2019-08-26 10:00:00", "2019-08-27 10:00:00", Boolean.TRUE);
-        for(Map.Entry<String, Integer> entry : map.entrySet()) {
+        for (Map.Entry<String, Integer> entry : map.entrySet()) {
             System.out.println(entry.getKey());
             System.out.println(entry.getValue());
         }

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

@@ -29,7 +29,7 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
     public static final DateTimeFormatter YEARMONTH_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM");
     public static final Integer DEL_BATCH_SIZE = 1000;
     public static final Integer COPY_BATCH_SIZE = 100;
-    public static final  int  MONTH_INTERVAL=2;
+    public static final int MONTH_INTERVAL = 2;
 
     @Autowired
     private RedisTemplate customRedisTemplate;
@@ -40,14 +40,14 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
      */
     @Scheduled(cron = "0 0 0 1 * ?")//每月1号0点触发
     @Transactional
-    public void transfer2HistoryTb(){
+    public void transfer2HistoryTb() {
         //获取表格名称
         String tbName = getTbNameNow();
         DateTime now = DateTime.now();//当前获取的时间为标准
         log.info("开始预定信息迁移至历史表的定时任务。");
         //每月初将上月数据复制到历史表
-        Boolean needRun= copyDataLastMoth(now,tbName);
-        if(needRun) {
+        Boolean needRun = copyDataLastMoth(now, tbName);
+        if (needRun) {
             //每月初将上上月数据从当前信息表中删除
             delDataTheMonthBeforeLast(now, tbName);
         }
@@ -57,14 +57,14 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
      * 获取上月数据，并复制到历史表
      */
     @Transactional
-    public Boolean copyDataLastMoth(DateTime now,String tbName){
+    public Boolean copyDataLastMoth(DateTime now, String tbName) {
         String lastMonthStr = now.plusMonths(-1).toString(YEARMONTH_DATE_TIME_FORMATTER);
-        String redisKey = RedisKey.DEL_BOOK_INFO_LOCK_PREFIX +lastMonthStr;
+        String redisKey = RedisKey.DEL_BOOK_INFO_LOCK_PREFIX + lastMonthStr;
 
-        Boolean hasSuc = customRedisTemplate.opsForValue().setIfAbsent(redisKey,String.valueOf(DateTime.now().getMillis()));
-        if(hasSuc){//设置1天后过期
-            customRedisTemplate.expire(redisKey,1, TimeUnit.DAYS);
-        }else{
+        Boolean hasSuc = customRedisTemplate.opsForValue().setIfAbsent(redisKey, String.valueOf(DateTime.now().getMillis()));
+        if (hasSuc) {//设置1天后过期
+            customRedisTemplate.expire(redisKey, 1, TimeUnit.DAYS);
+        } else {
             log.info("[预定信息迁移]乐观锁获取失败，该线程不执行任务。");
             return Boolean.FALSE;
         }
@@ -78,9 +78,9 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
             params.put("pageStart", (curPageNo - 1) * COPY_BATCH_SIZE);
             params.put("pageSize", COPY_BATCH_SIZE);
             vehicleBookInfoList = mapper.getByPage4YearMonth(params);
-            if(CollectionUtils.isNotEmpty(vehicleBookInfoList)){
+            if (CollectionUtils.isNotEmpty(vehicleBookInfoList)) {
                 //插入数据到历史表
-                for(VehicleBookInfo vehicleBookInfo : vehicleBookInfoList){
+                for (VehicleBookInfo vehicleBookInfo : vehicleBookInfoList) {
                     Map<String, Object> insertHisParams = Maps.newHashMap();
                     insertHisParams.put("tbName", tbName);
                     insertHisParams.put("id", vehicleBookInfo.getId());
@@ -91,17 +91,18 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
                 }
             }
             curPageNo++;
-            log.info("【复制上月预定信息至历史表中】，当前复制页【"+curPageNo+"】，页大小【"+COPY_BATCH_SIZE+"】");
-        }while(CollectionUtils.isNotEmpty(vehicleBookInfoList));
-        log.info("复制上月预定信息至历史表中完成，总页数【"+(curPageNo-1)+"】");
-;       return Boolean.TRUE;
+            log.info("【复制上月预定信息至历史表中】，当前复制页【" + curPageNo + "】，页大小【" + COPY_BATCH_SIZE + "】");
+        } while (CollectionUtils.isNotEmpty(vehicleBookInfoList));
+        log.info("复制上月预定信息至历史表中完成，总页数【" + (curPageNo - 1) + "】");
+        ;
+        return Boolean.TRUE;
     }
 
     /**
      * 删除上上月数据
      */
     @Transactional
-    public void delDataTheMonthBeforeLast(DateTime now,String tbName){
+    public void delDataTheMonthBeforeLast(DateTime now, String tbName) {
         String theMonthBeforeLastStr = now.plusMonths(-2).toString(YEARMONTH_DATE_TIME_FORMATTER);
         Integer effected = 0;
         Integer total = 0;
@@ -110,25 +111,29 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
         params.put("batchSize", DEL_BATCH_SIZE);
         do {
             effected = mapper.del4YearMoth(params);
-            total+=effected;
-            log.info("开始删除预定信息数据，删除总数【"+total+"】");
-        }while(effected!=0);
+            total += effected;
+            log.info("开始删除预定信息数据，删除总数【" + total + "】");
+        } while (effected != 0);
         log.info("删除预定信息数据完成");
     }
 
 
-    private String getTbNameNow(){
-        return TB_NAME_PREFIX+ DateTime.now().toString(YEAR_DATE_TIME_FORMATTER);
+    private String getTbNameNow() {
+        return TB_NAME_PREFIX + DateTime.now().toString(YEAR_DATE_TIME_FORMATTER);
     }
 
     /**
      * 创建当年相关表格
      */
-    private void createTbIfNotExists(String tbName){
+    private void createTbIfNotExists(String tbName) {
         mapper.createTbIfNotExists(tbName);
     }
 
     public void InsertBatch(List<VehicleBookInfo> bookInfos) {
         mapper.insertBatch(bookInfos);
     }
+
+    public int update(VehicleBookInfo vehicleBookInfo) {
+        return mapper.updateById(vehicleBookInfo);
+    }
 }

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

@@ -93,6 +93,12 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return list;
     }
 
+    public List<VehicleBookRecordVo> selectZeroHourRecord(Map<String, Object> param) {
+        List<VehicleBookRecordVo> list = mapper.selectZeroHourRecord(param);
+        removeStatus2(list);
+        return list;
+    }
+
     public int changeRecordStatus(Map<String, Object> updateParam) {
         return mapper.changeRecordStatus(updateParam);
     }

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

@@ -86,7 +86,7 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
         } else {
             vehicleDepartureLog.setUpdateTime(new Date());
             VehicleDepartureLog oldValue = mapper.selectByPrimaryKey(vehicleDepartureLog);
-            if(oldValue != null) {
+            if (oldValue != null) {
                 log.info("更新出行记录： vehicleDepartureLog = {}", oldValue);
                 BeanUtil.copyProperties(vehicleDepartureLog, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
                 oldValue.setUpdateTime(new Date());
@@ -116,7 +116,7 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
         List<VehicleDepartureLog> vehicleDepartureLogs = mapper.selectByExample(exm);
         if (vehicleDepartureLogs.size() == 1) {
             VehicleDepartureLog vehicleDepartureLog = vehicleDepartureLogs.get(0);
-            if (vehicleDepartureLog!=null) {
+            if (vehicleDepartureLog != null) {
                 return ObjectRestResponse.succ(vehicleDepartureLog);
             }
         }
@@ -124,7 +124,7 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     }
 
     @Transactional
-    public ObjectRestResponse collect(VehicleDepartureLog vdl){
+    public ObjectRestResponse collect(VehicleDepartureLog vdl) {
         vdl.setArrivalTime(new Date());
         vdl.setState(1);
         updateSelectiveById(vdl);

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

@@ -45,4 +45,6 @@ public interface VehicleBookInfoMapper extends Mapper<VehicleBookInfo> {
     public Integer del4YearMoth(Map<String, Object> params);
 
     void insertBatch(@Param("vbfs") List<VehicleBookInfo> bookInfos);
+
+    public Integer updateById(VehicleBookInfo vehicleBookInfo);
 }
\ No newline at end of file

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

@@ -37,4 +37,7 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
     public List<VehicleBookRecordVo> getBookRecordInfo(Map<String, Object> param);
 
     public List<VehicleBookRecordVo> selectByVehicleIdAndTime(Map<String, Object> param);
+
+    public List<VehicleBookRecordVo> selectZeroHourRecord(Map<String, Object> param);
+
 }
\ No newline at end of file

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

@@ -13,7 +13,7 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
     VehicleDepartureLog selectLastByVehicleId(String vehicleId);
 
     List<VehicleDepartureLogVo> selectByVehicleId(String vehicleId);
-
+    List<VehicleDepartureLog> selectByVehicle(String vehicleId);
     List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate, @Param("time") String time);
 
     List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("time") String time, @Param("companyList") List<Integer> companyList);

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

@@ -29,6 +29,8 @@ public interface VehicleMapper extends Mapper<Vehicle> {
     int updateStatusByIdAndStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status,
                                   @Param("lastStatus") Integer lastStatus);
 
+    int updateStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status);
+
     Vehicle selectByNumberPlate(String numberPlate);
 
     List<UsableVehicleModelVO> searchUsableModel(Map<String, Object> params);

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

@@ -26,7 +26,6 @@
         </foreach>
     </select>
 
-
   <insert id="insertIgnore" parameterType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
     insert ignore into vehicle_book_info ( vehicle, `year_month`, booked_date)
     values(#{vehicle},#{yearMonth},#{bookedDate})
@@ -47,6 +46,12 @@
           vehicle = #{vehicleId} and `year_month`=#{yearMonth} and
           booked_date &amp; #{andOperationFactor} = #{andOperationRs}
   </update>
+    <update id="updateById" parameterType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
+         update vehicle_book_info set
+             booked_date = #{bookedDate}
+         where
+        vehicle = #{vehicle} and `year_month`=#{yearMonth}
+    </update>
 
     <select id="getByPage4YearMonth" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
         select id, vehicle, `year_month`, booked_date, create_time, update_time from vehicle_book_info where `year_month` = #{yearMonth} order by id limit #{pageStart},#{pageSize}

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

@@ -330,6 +330,13 @@
          where v1.vehicle_id = #{vehicleId}   and v1.book_end_date <= #{bookedEndDate} and v1.status BETWEEN 1 and 2
     </select>
 
+    <select id="selectZeroHourRecord" resultMap="searchBookRecord" parameterType="java.util.Map">
+        select v1.* from vehicle_book_record v1
+         where v1.vehicle_id = #{vehicleId}
+         and (v1.book_end_date = #{bookedEndDate} or v1.book_start_date = #{bookedEndDate})
+         and v1.status BETWEEN 1 and 2
+    </select>
+
     <select id="getById" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord">
         select
             vbr.`id`,
@@ -373,7 +380,7 @@
 
     </select>
     <select id="selectByVehicleId" parameterType="java.lang.String"
-            resultType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
+            resultMap="searchBookRecord">
        SELECT v1.*,bc2.name retCompanyName from vehicle_book_record v1
                LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
         where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2

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

@@ -17,6 +17,13 @@
         order by create_time desc
     </select>
 
+    <select id="selectByVehicle" parameterType="java.lang.String" resultType="com.xxfc.platform.vehicle.entity.VehicleDepartureLog">
+        select vehicle_departure_log.*
+        from vehicle_departure_log
+        where vehicle_id = #{vehicleId}
+        order by create_time desc
+    </select>
+
     <select id="selectByBookRecordId" parameterType="java.lang.Long" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
         select vehicle_departure_log.*
         from vehicle_departure_log

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

@@ -359,6 +359,12 @@
         where id = #{vehicleId} and status = #{lastStatus}
     </update>
 
+    <update id="updateStatus">
+        update vehicle
+        set status = #{status}
+        where id = #{vehicleId} and status != 3
+    </update>
+
     <update id="updateMileageStatusByIdAndStatus">
         update vehicle
         set status = #{status},maintenance_mileage=#{mileage}