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){
            //检查车主信息
@@ -268,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
@@ -276,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(),"对不起，车辆信息不存在！");
@@ -355,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) {
@@ -532,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())
@@ -577,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)+"行车辆信息不完整，请检查表格内容！");
@@ -605,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){