最新版本541200007

jiangping

2025-04-28 ab890bca34582e2ec8e2d4b19798f067ea075b7a

 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(),"对不起，车辆信息不存在！");
@@ -532,7 +532,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 +577,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 +605,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){