修复bug

jiangping

2024-08-13 6765787baa5e0b771d71f865c4deb776367410c4

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

@@ -305,7 +305,10 @@
                vo.setPlateNos(obj.getPlateNos());
                vo.setPersonName(obj.getPersonName());
                vo.setPersonPhone(obj.getPersonPhone());
                vo.setPersonCompanyName(obj.getPersonCompanyName());
                if(!Constants.equalsInteger(obj.getPersonType(),Constants.TWO)){
                    //如果不是内部人员，显示访客企业名称
                    vo.setPersonCompanyName(obj.getVisitCompanyName());
                }
                vo.setParkName(obj.getParkName());
                vo.setGateName(obj.getGateName());
                vo.setInoutType(obj.getInoutType());
@@ -317,12 +320,6 @@
    }

    private IPage<CarEventDTO> getDataInfo(PageWrap<CarEvent> pageWrap) {
        //是否是数字
        boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
        //是否包含中文
        boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
        //是否包含英文
        boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());

        IPage<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
@@ -336,16 +333,16 @@
                .selectAs(Member::getPhone,CarEventDTO::getPersonPhone)
                .selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
                .selectAs(Member::getName,CarEventDTO::getPersonName)
                .selectAs(Member::getVisitCompanyName,CarEventDTO::getVisitCompanyName)
                .selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),

        queryWrapper
                .like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
                CarEvent::getPlateNos,
                pageWrap.getModel().getPlateNos())
                .like(number,
                        Member::getPhone,
                        pageWrap.getModel().getKeyWords())
                .like((b || hasWord),
                        Member::getPhone,
                        pageWrap.getModel().getKeyWords())

                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),i->i.like(Member::getPhone,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,
                        pageWrap.getModel().getKeyWords()))
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                        Company::getName,
                        pageWrap.getModel().getCompanyName())
@@ -384,6 +381,10 @@
                        +dataMap.get(Constants.CAR_EVENT_IMG).getCode()
                        +obj.getPlatePicUrl());
            }
            if(!Constants.equalsInteger(obj.getPersonType(),Constants.TWO)){
                //如果不是内部人员，显示访客企业名称
                obj.setPersonCompanyName(obj.getVisitCompanyName());
            }
             obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType()) );
            newDataList.add(obj);
        });