最新版本

jiangping

2024-10-14 2079ba28f20bde46f7736699c97abf0e1564770d

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java

@@ -83,7 +83,6 @@
                || Objects.isNull(carUseBook.getStartTime())
                || Objects.isNull(carUseBook.getEndTime())
                || Objects.isNull(carUseBook.getCreator())
                || Objects.isNull(carUseBook.getMemberId())
                || Objects.isNull(carUseBook.getPlanUseDate())
                || Objects.isNull(carUseBook.getType())
                || StringUtils.isEmpty(carUseBook.getMemberIds())
@@ -92,6 +91,9 @@
                || StringUtils.isEmpty(carUseBook.getAddr())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(Objects.nonNull(carUseBook.getCreator())&&Objects.isNull(carUseBook.getMemberId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前登录用户无法进行该操作!");
        }
        if(carUseBook.getEndTime().getTime()<=System.currentTimeMillis()){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"选择日期异常[结束时间小于当前时间],请刷新重试");
@@ -108,6 +110,7 @@
        if(Objects.isNull(cars)||!cars.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"车辆信息异常");
        }
        carUseBook.setCarCode(cars.getCode());
        //根据车辆查询司机信息
        CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
                .eq(CarDriver::getCarId,cars.getId())
@@ -124,7 +127,6 @@
        }
        carUseBookMapper.insert(carUseBook);
        //用车申请 审批记录创建

        approveService.createApproveFlow(carUseBook.getType()==0?3:4,carUseBook.getId(),carUseBook.getMemberId());
        return carUseBook.getId();
    }
@@ -184,6 +186,9 @@
                .eq(CarUseBook::getId,id)
                .last("limit 1"  );
        CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
        if(Objects.isNull(model)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id,
                Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4,
                memberId);
@@ -207,6 +212,7 @@
                }
            }
            approve.setCheckInfo(model.getCancelInfo());
            approve.setCheckDate(model.getCancelTime());
            approveList.add(approve);
        }
        model.setApproveDateVO(approveDataVO);
@@ -372,11 +378,6 @@
                        .or().apply("  START_TIME < '"+dateDay+" 00:00:00' and END_TIME  > '"+dateDay+" 23:59:59'  "))
        );
        for (DateIntervalVO dateIntervalVO:dateIntervalVOList) {
            //判断时间是否大于当前
            if(DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
                dateIntervalVO.setIsUse(Constants.ONE);
                continue;
            }
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){
                for (CarUseBook i:carUseBookList  ) {
                    if(
@@ -389,10 +390,16 @@
                                    (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() >= i.getStartTime().getTime() &&
                                            DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime() <= i.getEndTime().getTime())
                    ){
                        dateIntervalVO.setCarUseBookId(i.getId());
                        dateIntervalVO.setIsUse(Constants.ONE);
                        break;
                    }
                }
            }
            //判断时间是否大于当前
            if(Constants.equalsInteger(dateIntervalVO.getIsUse(),Constants.ZERO)  && DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
                dateIntervalVO.setIsUse(Constants.ONE);
                continue;
            }
        }
        return dateIntervalVOList;
@@ -436,7 +443,7 @@
       carUseBook.setCancelTime(new Date());
       carUseBook.setCancelStatus(Constants.ONE);
       carUseBook.setStatus(Constants.FOUR);
       carUseBook.setCancelUser(loginUserInfo.getId());
       carUseBook.setCancelUser(loginUserInfo.getMemberId());
       carUseBook.setCancelType(Constants.ONE);
       if(loginUserInfo.getId().equals(carUseBook.getCreator())){
           carUseBook.setCancelType(Constants.ZERO);