rk
10 小时以前 1fb6ce7f165e85cb9458d6e8d1b6bf7debc1e665
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -157,6 +157,7 @@
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(this.carUseBookList(carUseBook))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"存在车辆预约时间与已预约时间冲突~");
        }
        carUseBook.setTypeInfo(Constants.equalsInteger(carUseBook.getType(),Constants.ZERO)?"市内":"室外");
        carUseBookMapper.insert(carUseBook);
        //用车申请 审批记录创建
        approveService.createApproveFlow(carUseBook.getType()==0?3:4,carUseBook.getId(),carUseBook.getMemberId(),null);
@@ -685,7 +686,7 @@
        String addr =   dataJSON.getString("addr");
        CarUseBook carUseBook = carUseBookJoinMapper.selectOne(new QueryWrapper<CarUseBook>()
                .lambda().eq(CarUseBook::getJdyId,no).last("limit 1"));
                .lambda().eq(CarUseBook::getJdyNo,no).last("limit 1"));
        if(Objects.isNull(carUseBook)){
            carUseBook = new CarUseBook();
            carUseBook.setCreateDate(new Date());
@@ -710,6 +711,7 @@
        carUseBook.setContent(StringUtils.isBlank(reason)?null:reason);
        carUseBook.setAddr(StringUtils.isBlank(addr)?null:addr);
        carUseBook.setStatus(Constants.TWO);
        carUseBook.setKeyStatus(Constants.ZERO);
        JSONObject driverJSON = dataJSON.getJSONObject("driver");
        if(Objects.nonNull(driverJSON)){
            String driverName = driverJSON.getString("name");