Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-09-25 75310c871f4cb82a6985161fbc7e3c7d86f066a4

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

@@ -206,7 +206,8 @@
        getHkDeviceRoles(visits,isERP);
        //检验拜访人是否合法
        Member visitMember = isValideVisitedUser(visits.getReceptMemberId());
        if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&visits.getIdcardNo().length()!=18
        if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())
                &&visits.getIdcardNo().length()!=18
        ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证号码有误，请核实后重试！");
        }
@@ -1141,6 +1142,15 @@
                        result.getType(),
                        memberId)
        );
        if(Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.xfSuccess)
                || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.xfFail)
                || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.signin)
                || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.signout)
                || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.invalid)){
            result.setBusinessStatus(Constants.VisitStatus.pass);
        }else{
            result.setBusinessStatus(result.getStatus());
        }

        return result;
    }
@@ -1260,6 +1270,15 @@
        VisitDetailVO visitDetailVO = new VisitDetailVO();
        visitDetailVO.setCreateTime(visits.getCreateDate());
        visitDetailVO.setStatus(visits.getStatus());
        if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)
        || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfFail)
        || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.signin)
        || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.signout)
        || Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.invalid)){
            visitDetailVO.setBusinessStatus(Constants.VisitStatus.pass);
        }else{
            visitDetailVO.setBusinessStatus(visits.getStatus());
        }
        visitDetailVO.setCarNos(visits.getCarNos());
        visitDetailVO.setPhone(visits.getPhone());
        visitDetailVO.setVisitUserName(member.getName());