整理

jiangping

2024-02-27 cd9cbc46c0774c01674be435bcc86d4a03ada687

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

@@ -123,7 +123,7 @@
        //普通访客
        visits.setType(Constants.ONE);
        //随行人员数量
        visits.setMemberNum(CollectionUtils.isNotEmpty(visits.getWithUserList())?visits.getWithUserList().size()+1:1);
        visits.setMemberNum(CollectionUtils.isNotEmpty(visits.getWithUserList())?visits.getWithUserList().size():0);
        //访客信息(使用身份证号查询是否已存在改普通访客，没有则新增，存在则更新openid等信息),包括随访人员校验和处理
        Member member =dealMemberAndVisits(visits);
        visits.setMemberId(member.getId());
@@ -683,11 +683,11 @@
    }

    private Member getMemberListParam(String cardno, Visits visits, List<Member> addList, List<Member> editList) {
        if(!StringUtils.isNotBlank(visits.getCarNos())
//                &&!Constants.checkCarNo(visits.getCarNos())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，车牌号【"+visits.getCarNos()+"】不合法，请核实后重试~");
        }
//        if(!StringUtils.isNotBlank(visits.getCarNos())
////                &&!Constants.checkCarNo(visits.getCarNos())
//        ){
//            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，车牌号【"+visits.getCarNos()+"】不合法，请核实后重试~");
//        }
        if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18
            //&&!IdcardUtil.isValidCard(cardno)
        ){
@@ -978,6 +978,7 @@
        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();

        queryWrapper.selectAll(Visits.class);
        queryWrapper.select("  ( select count(distinct(v.CAR_NOS)) from visits v where v.PARENT_ID = t.ID and v.CAR_NOS is not null  and v.CAR_NOS != ''  and v.CAR_NOS != t.CAR_NOS ) as carNum  ");
        queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
        queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
@@ -993,6 +994,12 @@
        queryWrapper.isNull(Visits::getParentId);
        queryWrapper.orderByDesc(Visits::getCreateDate);
        IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);

        for (Visits visits:result.getRecords()) {
            if(StringUtils.isNotBlank(visits.getCarNos())){
                visits.setCarNum(visits.getCarNum() + Constants.ONE);
            }
        }
        return PageData.from(result);
    }

@@ -1005,12 +1012,12 @@

    @Override
    public PageData<Visits> retentionPage(PageWrap<Visits> pageWrap) {
        String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
        IPage<Visits> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();

        queryWrapper.selectAll(Visits.class);
        queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
        queryWrapper.select("TIMESTAMPDIFF(MINUTE,t.ENDTIME , NOW()) AS timeOut");
        queryWrapper.select("TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) AS timeOut");
        queryWrapper.selectAs(Member::getType,Visits::getMemberType);
        queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
@@ -1018,6 +1025,9 @@
        queryWrapper.leftJoin(" member m on m.id=t.MEMBER_ID");

        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getLevelStatus()),Visits::getStatus,Constants.VisitStatus.signin);

        queryWrapper.apply(Objects.nonNull(pageWrap.getModel().getLevelStatus())," TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) <= "+code+"  ");

        queryWrapper.ne("m.type ",Constants.TWO);
        queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Visits::getType,pageWrap.getModel().getType());
@@ -1026,20 +1036,20 @@
                .eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Visits::getIdcardNo,StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()))
                .eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Visits::getCompanyName,pageWrap.getModel().getCompanyName())
                .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Visits::getStatus,pageWrap.getModel().getStatus());
        queryWrapper.isNull(Visits::getOutDate);
        queryWrapper.isNull(!Objects.nonNull(pageWrap.getModel().getLevelStatus()),Visits::getOutDate);
        queryWrapper.orderByDesc(Visits::getEditDate);
       String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_FREEZE).getCode();
        IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);
        if(result!=null&&result.getRecords()!=null){
            result.getRecords().stream().forEach(s ->{
                if(s.getTimeOut()>=Constants.ZERO){
                    s.setOutStatus(Constants.ONE);
                }else if(s.getTimeOut()<=Integer.valueOf(code)&&s.getTimeOut()>0){
                    s.setOutStatus(Constants.TWO);
                }else{
                    s.setOutStatus(Constants.ZERO);
                if(s.getStatus().equals(Constants.VisitStatus.signin)){
                    if(s.getTimeOut()<=Integer.valueOf(code)&&s.getTimeOut()>=0){
                        s.setOutStatus(Constants.TWO);
                    }else if(s.getTimeOut()>Constants.ZERO){
                        s.setOutStatus(Constants.ZERO);
                    }else{
                        s.setOutStatus(Constants.ONE);
                    }
                }

            });
        }