Merge remote-tracking branch 'origin/master'

rk

2025-09-29 218e84d2264e413f31a2f3957f05bb7b8ad42d5d

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

@@ -72,14 +72,14 @@
        if(loginUserInfo == null){
            loginUserInfo = model.getLoginUserInfo();
        }
        if(StringUtils.isBlank(model.getCode())
    /*    if(StringUtils.isBlank(model.getCode())
            ||model.getType()==null
            ||model.getCateId()==null
            ||model.getType()<0
            ||model.getType()>3
        ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        }*/

        if(model.getMemberId()!=null){
            //检查车主信息
@@ -131,24 +131,25 @@
        }
        Date date = new Date();
        //删除已授权下发的包期授权
        dealCancelBookBiz(car.getCode(),date);
        Cars model = new Cars();
        model.setEditDate(date);
        model.setEdirot(user.getId());
        model.setId(id);
        model.setIsdeleted(Constants.ONE);
        dealCancelBookBiz(car.getCode(),date,parkBookJoinMapper);
//        Cars model = new Cars();
//        model.setEditDate(date);
//        model.setEdirot(user.getId());
//        model.setId(id);
//        model.setIsdeleted(Constants.ONE);
        carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
                .eq(Cars::getId,model.getId())
                .eq(Cars::getId,id)
                .set(Cars::getStartTime,null)
                .set(Cars::getEndTime,null)
                .set(Cars::getAuthTimeType,null)
                .set(Cars::getAuthStatus,Constants.ZERO)
                .set(Cars::getIsdeleted,Constants.ONE)
                .set(Cars::getEditDate,model.getEditDate())
                .set(Cars::getEdirot,model.getEdirot())
                .set(Cars::getEditDate,date)
                .set(Cars::getEdirot,user.getId())
        );
        carsMapper.updateById(model);
//        carsMapper.updateById(model);
    }
    public   boolean  dealCancelBookBiz(String code,Date date){
    public static    boolean  dealCancelBookBiz(String code,Date date,ParkBookMapper parkBookJoinMapper){

        List<ParkBook> parkBooks = parkBookJoinMapper.selectJoinList(ParkBook.class,new MPJLambdaWrapper<ParkBook>()
                .selectAll(ParkBook.class )
@@ -267,7 +268,7 @@
        if(loginUserInfo == null){
            loginUserInfo = model.getLoginUserInfo();
        }
        if(StringUtils.isBlank(model.getCode())
       /* if(StringUtils.isBlank(model.getCode())
                ||model.getId()==null
                ||model.getType()==null
                ||model.getCateId()==null
@@ -275,7 +276,7 @@
                ||model.getType()>3
        ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        }*/
        Cars car = carJoinMapper.selectById(model.getId());
        if(car ==null ||Constants.equalsInteger(car.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，车辆信息不存在！");
@@ -310,7 +311,7 @@
        model.setHkStatus(Constants.ZERO);
        model.setRemark("");
        model.setAuthStatus(Constants.ZERO);
        dealCancelBookBiz(car.getCode(),model.getEditDate());
        dealCancelBookBiz(car.getCode(),model.getEditDate(),parkBookJoinMapper);
        carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
                .eq(Cars::getId,model.getId())
                .set(Cars::getAuthStatus,Constants.ZERO)
@@ -321,6 +322,7 @@
                .set(Cars::getEditDate,model.getEditDate())
                .set(Cars::getEdirot,model.getEdirot())
                .set(Cars::getMemberId,model.getMemberId())
                .set(Cars::getAuthTimeType,null)
                .set(Cars::getStartTime,null)
                .set(Cars::getEndTime,null)
        );
@@ -353,10 +355,25 @@

    @Override
    public List<Cars> findList(Cars cars) {
        if(Objects.nonNull(cars)
        && Constants.equalsInteger(Constants.ZERO,cars.getType())){
            return this.getGwCar();
        }
        QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
        wrapper.lambda().eq(Cars::getIsdeleted,Constants.ZERO);
        return carsMapper.selectList(wrapper);
    }

    public List<Cars> getGwCar(){
        List<Cars> list  = carsMapper.selectJoinList(Cars.class,
                new MPJLambdaWrapper<Cars>().selectAll(Cars.class)
                        .leftJoin(Category.class,Category::getId,Cars::getCateId)
                        .eq(Category::getBizType,Constants.FOUR)
                        .eq(Cars::getIsdeleted,Constants.ZERO)
        );
        return list;
    }


    @Override
    public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {
@@ -365,6 +382,7 @@
        queryWrapper.selectAll(Cars.class);
        queryWrapper.selectAs(Member::getType,Cars::getMemberType);
        queryWrapper.selectAs(Member::getName,Cars::getMemberName);
        queryWrapper.selectAs(Member::getIsdeleted,Cars::getMemberDeleted);
        queryWrapper.selectAs(SystemUser::getRealname,Cars::getEditorName);
        queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
        queryWrapper.selectAs(Member::getSex,Cars::getMemberSex);
@@ -421,6 +439,9 @@
                    cars.setGroupCateName(StringUtils.defaultString(cars.getCatePName(),"") + "/" + StringUtils.defaultString(cars.getCateName(),""));
                }
               cars.setParkBookList(getParkbookListByCode(cars,parkBooks));
                if(Constants.equalsInteger(cars.getMemberDeleted(),Constants.ONE)){
                    cars.setMemberId(null);
                }
            }
        }
        return PageData.from(result);
@@ -458,6 +479,7 @@
                .leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
        wrapper.selectAs(ParkBook::getCarCode,CarsDTO::getCode)
                .selectAs(ParkBook::getParkId,CarsDTO::getParkId)
                .selectAs(Member::getIsdeleted,CarsDTO::getMemberDeleted)
                .selectAs(ParkBook::getRemark,CarsDTO::getRemark)
                .selectAs(Parks::getName,CarsDTO::getParkName)
                .selectAs(ParkBook::getMemberId,CarsDTO::getMemberId)
@@ -470,7 +492,13 @@
                .selectAs(ParkBook::getCreateDate,CarsDTO::getCreateDate);
        wrapper.orderByDesc(ParkBook::getCreateDate);
        IPage<CarsDTO> carsDTOIPage = parkBookJoinMapper.selectJoinPage(page, CarsDTO.class, wrapper);

        if(carsDTOIPage!=null && carsDTOIPage.getRecords()!=null && carsDTOIPage.getRecords().size()>0){
            for(CarsDTO cars :carsDTOIPage.getRecords()){
                if(Constants.equalsInteger(cars.getMemberDeleted(),Constants.ONE)){
                    cars.setMemberId(null);
                }
            }
        }
        return PageData.from(carsDTOIPage);
    }

@@ -519,7 +547,7 @@
                model.setPhone(ScientificNotationTUtil.convertToString(model.getPhone()));
               if(StringUtils.isBlank(model.getCode())
                        &&StringUtils.isBlank(model.getCategoryName())
                        &&StringUtils.isBlank(model.getType())
//                        &&StringUtils.isBlank(model.getType())
                        &&StringUtils.isBlank(model.getSex())
                        &&StringUtils.isBlank(model.getIdcard())
                        &&StringUtils.isBlank(model.getParkName())
@@ -564,7 +592,7 @@
            ,List<Company> companyList
            ,List<Category> categoryList ) {
        if(StringUtils.isBlank(model.getCode())
                ||StringUtils.isBlank(model.getType())
//                ||StringUtils.isBlank(model.getType())
                ||StringUtils.isBlank(model.getCategoryName())
                ||StringUtils.isBlank(model.getCompanyName())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+2)+"行车辆信息不完整，请检查表格内容！");
@@ -592,14 +620,14 @@
            cars.setIsnew(Constants.ZERO);
            updateList.add(cars);
        }
        //类型 0安泰公务车 1安泰自有物流车 2其它
      /*  //类型 0安泰公务车 1安泰自有物流车 2其它
        if(StringUtils.equals(model.getType(),"安泰公务车")){
            cars.setType(Constants.ZERO);
        }else if(StringUtils.equals(model.getType(),"安泰自有物流车")){
            cars.setType(Constants.ONE);
        }else{
            cars.setType(Constants.TWO);
        }
        }*/
        cars.setCode(model.getCode());
        Company company = findCompanyFromList(model.getCompanyName(),companyList);
        if(company == null){