最新版本541200007

jiangping

2024-11-07 4c2bae1c7e6f84699091a7e094120808137138dc

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

@@ -370,6 +370,8 @@
        queryWrapper.selectAs(Member::getName,Cars::getMemberName);
        queryWrapper.selectAs(SystemUser::getRealname,Cars::getEditorName);
        queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
        queryWrapper.selectAs(Member::getSex,Cars::getMemberSex);
        queryWrapper.selectAs(Member::getIdcardDecode,Cars::getMemberCard);
        queryWrapper.selectAs(Company::getCompanyNamePath,Cars::getCompanyName);
        queryWrapper.selectAs(Category::getParentId,Cars::getCatePId);
        queryWrapper.selectAs(Category::getName,Cars::getCateName);
@@ -386,6 +388,7 @@
                .or().like(Member::getPhone,pageWrap.getModel().getMemberName()));
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getCompanyNamePath,pageWrap.getModel().getCompanyName());
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType());
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCateId()),Category::getId,pageWrap.getModel().getCateId());
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCatePId()),Category::getParentId,pageWrap.getModel().getCatePId());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Cars::getCode,pageWrap.getModel().getCode());
        queryWrapper.eq(Cars::getIsdeleted,Constants.ZERO);
@@ -417,22 +420,28 @@
                    .in(ParkBook::getCarCode,codes)
                    .eq(ParkBook::getIsdeleted,Constants.ZERO) );
            for(Cars cars :result.getRecords()){
               cars.setParkBookList(getParkbookListByCode(cars.getCode(),parkBooks));
                if(StringUtils.isNotBlank(cars.getCateName())){
                    cars.setGroupCateName(StringUtils.defaultString(cars.getCatePName(),"") + "/" + StringUtils.defaultString(cars.getCateName(),""));
                }
               cars.setParkBookList(getParkbookListByCode(cars,parkBooks));
            }
        }
        return PageData.from(result);
    }

    private List<ParkBook> getParkbookListByCode(String code, List<ParkBook> parkBooks) {
    private List<ParkBook> getParkbookListByCode(Cars car, List<ParkBook> parkBooks) {
        List<ParkBook> list =null;
        String name = "";
        for(ParkBook p : parkBooks){
            if(StringUtils.equals(p.getCarCode(),code)){
            if(StringUtils.equals(p.getCarCode(),car.getCode())){
                if(list == null){
                    list = new ArrayList<>();
                }
                name += p.getParksName();
                list.add(p);
            }
        }
        car.setParksName(name);
        return  list;
    }