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

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/process/ResultCode.java

@@ -8,8 +8,8 @@ public class ResultCode {
 	////////////////////////////参数相关///////////////////////////
 	//参数非法，请修改
 	public static int PARAM_ILLEGAL_CODE = Integer.valueOf(SystemProperty.getResultConfig("PARAM_ILLEGAL_CODE"));
-	//参数时效已过时，不能使用
-	public static int PARAM_EXPIRE_CODE = Integer.valueOf(SystemProperty.getResultConfig("PARAM_EXPIRE_CODE"));
+	//参数时效已过时，不能使用X
+	public static int PARAM_EPIRE_CODE = Integer.valueOf(SystemProperty.getResultConfig("PARAM_EXPIRE_CODE"));
 	public static int VEHICLE_IS_BOOKED = Integer.valueOf(SystemProperty.getResultConfig("VEHICLE_IS_BOOKED"));
 	// 操作成功
 	public static int SUCCESS_CODE = Integer.valueOf(SystemProperty.getResultConfig("SUCCESS_CODE"));

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java

@@ -76,7 +76,7 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
             if(query.entrySet().size()>0) {
                 Example.Criteria criteria = example.createCriteria();
                 for (Map.Entry<String, Object> entry : query.entrySet()) {
-                    criteria.andLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
+                    criteria.orLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
                 }
             }
             example.createCriteria().andGreaterThan("id",1);
@@ -88,7 +88,7 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
             if(query.entrySet().size()>0) {
                 Example.Criteria criteria = example.createCriteria();
                 for (Map.Entry<String, Object> entry : query.entrySet()) {
-                    criteria.andLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
+                    criteria.orLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
                 }
             }
             if(StringUtils.isNotBlank(currentUser.getDataCompany())){

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

@@ -9,7 +9,6 @@ import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserManage;
 import com.github.wxiaoqi.security.admin.entity.User;
-import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
@@ -17,16 +16,11 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * app用户管理类

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -166,22 +166,31 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         }
         UserCouponVo userCouponVo=null;
         if (list2.size()>0){
-                 userCouponVo=list2.get(0);
+            list2.sort(Comparator.comparing(UserCouponVo::getStatus));
+             userCouponVo=list2.get(0);
                 if (userCouponVo!=null){
                     userCouponVo.setIsChecked(1);
                     list2.set(0,userCouponVo);
                 }
-            list2.sort(Comparator.comparing(UserCouponVo::getStatus));
+
         }
         if (list1.size()>0){
+            list1.sort(Comparator.comparing(UserCouponVo::getStatus));
             if (userCouponVo==null){
-                 userCouponVo=list1.get(0);
+                int num=0;
+                for (UserCouponVo couponVo:list1) {
+                    if (couponVo.getStatus()==1){
+                        userCouponVo=couponVo;
+                        break;
+                    }
+                    num++;
+                }
                 if (userCouponVo!=null){
                     userCouponVo.setIsChecked(1);
-                    list1.set(0,userCouponVo);
+                    list1.set(num,userCouponVo);
                 }
             }
-            list1.sort(Comparator.comparing(UserCouponVo::getStatus));
+
         }
         JSONArray array = new JSONArray();
         JSONObject object=new JSONObject();

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/AppVersionBiz.java

@@ -5,18 +5,11 @@ import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.constant.RestCode;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.util.EntityUtils;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.xxfc.platform.app.vo.appVersionQuery;
-import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.constant.RedisKey;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.session.RowBounds;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -32,18 +25,13 @@ import com.xxfc.platform.app.entity.AppVersion;
 import com.xxfc.platform.app.mapper.AppVersionMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionController.java

@@ -4,37 +4,18 @@ import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.constant.AppFormat;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
-import com.github.wxiaoqi.security.common.util.Query;
-import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.app.biz.AppVersionBiz;
 import com.xxfc.platform.app.entity.AppVersion;
-import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.vo.appVersionQuery;
-import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Delete;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 @RestController
 @RequestMapping("version")

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

@@ -204,7 +204,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleDepartureVo.setExpectArrivalBranchCompanyId(orderRentVehicleDetail.getEndCompanyId());
             vehicleDepartureVo.setMileage(orderVehicleCrosstownDto.getMileage());
             vehicleDepartureVo.setUse("用户租车");
-            vehicleDepartureVo.setBookRecordId(Integer.parseInt(orderRentVehicleDetail.getBookRecordId() + ""));
+            vehicleDepartureVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
             vehicleDepartureVo.setUser(userDTO.getUsername());
             vehicleDepartureVo.setUserTel(userDTO.getTelPhone());
             vehicleDepartureVo.setCheckMan(orderVehicleCrosstownDto.getLicenseName());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -239,7 +239,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //如果用户存在，并且为会员，并且车辆有优惠价
         if(null != dto && null != detail.getRentFreeDay() && detail.getRentFreeDay() > 0 ) {
             if(null == dto.getRentFreeDays() || dto.getRentFreeDays() <= 0) {
-                throw new BaseException(ResultCode.PARAM_EXPIRE_CODE, new HashSet<String>() {{
+                throw new BaseException(ResultCode.PARAM_EPIRE_CODE, new HashSet<String>() {{
                     add("免费租车天数不存在或为0");
                 }});
             }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java

@@ -35,6 +35,7 @@ import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import lombok.extern.log4j.Log4j;
+import org.mockito.internal.util.collections.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,7 +48,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 @Service
@@ -135,8 +136,18 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
             setSiteId(bo.getSiteId());
         }})).getData().get(0).getId());
 
+        Integer departureStatus = tourFeign.selectDepartureStatusByVerificationId(bo.getVerificationId());
+        //1为已发车
+        if(!SYS_FALSE.equals(departureStatus)) {
+            throw new BaseException(ResultCode.PARAM_EPIRE_CODE, Sets.newSet("旅程已发车，不能下单"));
+        }
+
         //扣減庫存
-        tourFeign.stock(bo.getSpePriceId(), bo.getTotalNumber(), TourFeign.STOCK_SUBTRACT);
+        ObjectRestResponse<TourSpePriceVo> response = tourFeign.stock(bo.getSpePriceId(), bo.getTotalNumber(), TourFeign.STOCK_SUBTRACT);
+        if(!SYS_JSON_TRUE.equals(response.getStatus())) {
+            throw new BaseException(ResultCode.PARAM_EPIRE_CODE, Sets.newSet("库存不足"));
+        }
+
 
         OrderItem tourAdultItem = bo.getItemByTypeEnum(ItemTypeEnum.TOUR_ADULT);
         OrderItem tourChildItem = bo.getItemByTypeEnum(ItemTypeEnum.TOUR_CHILD);

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

@@ -87,7 +87,7 @@ public class VehicleDepartureLog {
     /**
      * 预约记录id
      */
-    Integer bookRecordId;
+    Long bookRecordId;
     //违章图片，逗号分隔
     String illegalPic;
     //违章金额

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

@@ -38,6 +38,6 @@ public class VehicleArrivalVo {
     //违章金额
     Integer illegalAmount;
 
-    Integer bookRecordId;
+    Long bookRecordId;
 
 }

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

@@ -48,7 +48,7 @@ public class VehicleDepartureVo {
     /**
      * 预约记录id
      */
-    Integer bookRecordId;
+    Long bookRecordId;
 
     //出车图片
     String departurePic;

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

@@ -101,6 +101,7 @@ public class VehicleActiveService {
                departureLog.setState(VehicleDepartureState.DEPARTURE.getCode());
                departureLog.setDepartureRemark(departureVo.getRemark());
                if(vehicleBookRecord != null) {
+                   departureLog.setDepartureBranchCompanyId(vehicleBookRecord.getLiftCompany());
                    departureLog.setUse(BookType.getByCode(vehicleBookRecord.getBookType()));
                    departureLog.setUser(vehicleBookRecord.getVehicleUsername());
                    departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
@@ -117,6 +118,7 @@ public class VehicleActiveService {
                departureLog.setBookRecordId(departureVo.getBookRecordId());
                departureLog.setDepartureRemark(departureVo.getRemark());
                if(vehicleBookRecord != null) {
+                   departureLog.setDepartureBranchCompanyId(vehicleBookRecord.getLiftCompany());
                    departureLog.setUse(BookType.getByCode(vehicleBookRecord.getBookType()));
                    departureLog.setUser(vehicleBookRecord.getVehicleUsername());
                    departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
@@ -204,9 +206,9 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
             }
-
+            VehicleBookRecord vehicleBookRecord = null;
             if(arrivalVo.getBookRecordId() != null) {
-                VehicleBookRecord vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
+                vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
                 updateBookRecordStatus(vehicleBookRecord, 2);
             }
 
@@ -228,6 +230,9 @@ public class VehicleActiveService {
                 departureLog.setIllegalAmount(arrivalVo.getIllegalAmount());
                 departureLog.setArrivalPic(arrivalVo.getArrivalPic());
                 departureLog.setArrivalRemark(arrivalVo.getRemark());
+                if(vehicleBookRecord != null) {
+                    departureLog.setDepartureBranchCompanyId(vehicleBookRecord.getRetCompany());
+                }
                 vehicleDepartureLogMapper.updateByPrimaryKeySelective(departureLog);
             // 车辆活动日志
             VehicleActiveLog activeLog = vehicleActiveLogMapper.selectLastByVehicleId(arrivalVo.getVehicleId());

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

@@ -148,7 +148,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
 
     public static void main(String[] args) throws Exception{
         int b = 16744448;
-        Integer a = b | 0;
+        Integer a = b | 48;
         System.out.println(a);
     }
 

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

@@ -7,20 +7,19 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 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.vo.PageDataVO;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.xxfc.platform.universal.utils.DateUtil;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.BookType;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
-import com.xxfc.platform.vehicle.entity.BookRecordAccItem;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
-import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
+import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper;
 import com.xxfc.platform.vehicle.pojo.*;
@@ -57,6 +56,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     public static final String TB_ACC_ITEM_NAME_REAL = "book_record_acc_item";//实际表名
     public static final DateTimeFormatter YEAR_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy");
     public static final DateTimeFormatter YEARMONTH_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM");
+    public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
     public static final Integer DEL_BATCH_SIZE = 1000;
     public static final Integer COPY_BATCH_SIZE = 100;
 
@@ -73,6 +73,11 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     @Autowired
     VehicleUpkeepService vehicleUpkeepService;
 
+    @Autowired
+    VehicleBookHourInfoBiz vehicleBookHourInfoBiz;
+    @Autowired
+    VehicleDepartureService vehicleDepartureService;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -340,6 +345,49 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return rs;
     }
 
+    /**
+     * 检验数据库预定记录日期是否和时间，日期表中的二进制数据一致
+     * @return
+     */
+    public ObjectRestResponse checkDateInvalide(){
+        List<VehicleBookRecord> list = mapper.selectAll();
+        List<VehicleBookRecord> unRightList = new ArrayList<>();
+        if(list != null && list.size() > 0) {
+            for(VehicleBookRecord vehicleBookRecord : list) {
+                log.info("vehicleBookRecord = {}", vehicleBookRecord);
+                Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(DateUtil.dateToStr(vehicleBookRecord.getBookStartDate(), "yyyy-MM-dd HH:mm:ss"), DateUtil.dateToStr(vehicleBookRecord.getBookStartDate(), "yyyy-MM-dd HH:mm:ss"), Boolean.TRUE);
+                log.info("转换为时间二进制：map = {}", map);
+                //检验数据有效性
+                if(vehicleBookRecord.getStatus() == 2) {
+                    VehicleDepartureLogVo vehicleDepartureLog = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
+                    if(vehicleDepartureLog == null || vehicleDepartureLog.getState() != 1) { //未出车或未还车
+                        for(Map.Entry<String, Integer> entry : map.entrySet()) {
+                            VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+                            vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
+                            vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+                            List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
+                            log.info("预定时间信息：vehicleBookHourInfos = {}", vehicleBookHourInfos);
+                            if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
+                                //检验数据是否存在
+                                if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) {
+                                    log.info("时间正确，已经存在");
+                                } else {
+                                    log.info("时间不正确");
+                                    vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() | entry.getValue()));
+                                    log.info("更新预定时间数据：vehicleBookHourInfos = {}", vehicleBookHourInfos);
+                                    vehicleBookHourInfoBiz.updateSelectiveByIdRe(vehicleBookHourInfos.get(0));
+                                    unRightList.add(vehicleBookRecord);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+        return ObjectRestResponse.succ(unRightList);
+    }
+
 
     /**
      * 迁移数据到历史表

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

@@ -50,6 +50,10 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
         return new PageInfo<>(mapper.selectByVehicleId(vehicleId));
     }
 
+    public VehicleDepartureLogVo getByRecordId(Long vehicleBookRecordId) {
+        return mapper.selectByBookRecordId(vehicleBookRecordId);
+    }
+
     public VehicleDepartureStatisticDataVo statistic(String numberPlate) {
         Vehicle vehicle = vehicleMapper.selectByNumberPlate(numberPlate);
         if (vehicle == null) {

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

@@ -22,5 +22,5 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
 
     String selectDayByVehicleId(String vehicleId);
 
-    VehicleDepartureLogVo selectByBookRecordId(Integer bookRecordId);
+    VehicleDepartureLogVo selectByBookRecordId(Long bookRecordId);
 }

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

@@ -209,6 +209,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
         bookVehicleVo.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
+        bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
         baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
         return RestResponse.suc();
     }
@@ -225,6 +226,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
         bookVehicleVo.setStatus(VehicleBookRecordStatus.APPLY.getCode());
+        bookVehicleVo.setNotCheckTimeLegal(Boolean.FALSE);
         baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
         return RestResponse.suc();
     }
@@ -497,4 +499,11 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         vehicleJobHandler.execute(month);
         return RestResponse.suc();
     }
+
+    @GetMapping("/app/unauth/checkHourInfo")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse checkHourInfo() {
+        return vehicleBookRecordBiz.checkDateInvalide();
+    }
 }

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

@@ -485,7 +485,7 @@
             and v1.book_user != -2
         </where>
         group by v1.id
-        order by book_start_date DESC
+        order by create_time DESC
     </select>
 
 

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

@@ -17,7 +17,7 @@
         order by create_time desc
     </select>
 
-    <select id="selectByBookRecordId" parameterType="java.lang.Integer" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
+    <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}