代码初始化

k94314517

2025-05-07 457571f9c87f14c39c1e30678aefe981dea908af

代码初始化

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java

@@ -160,8 +160,9 @@
    private Integer categoryId;

    @ApiModelProperty(value = "关联分类名称")
    @ExcelColumn(name="关联分类名称")
    @ExcelColumn(name="车辆分类" ,index = 8,width = 16)
    private String categoryName;

    @ApiModelProperty(value = "关联父级分类编码（关联category)", example = "1")
    @ExcelColumn(name="关联父级分类编码（关联category)")
    private Integer categoryParentId;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java

@@ -55,4 +55,6 @@
    private Date endTime;
    @ApiModelProperty(value = "访客公司名称")
    private String visitCompanyName;
    @ApiModelProperty(value = "车辆分类")
    private String categoryName;
}

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

@@ -247,10 +247,12 @@
                .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                        p-> p.like(Company::getName, pageWrap.getModel().getCompanyName())
                                .or().like(Member::getVisitCompanyName, pageWrap.getModel().getCompanyName()))
                .eq(Objects.nonNull(pageWrap.getModel().getCarType()),
                        Retention::getCarType,pageWrap.getModel().getCarType())
//                .eq(Objects.nonNull(pageWrap.getModel().getCarType()),
//                        Retention::getCarType,pageWrap.getModel().getCarType())
                .like(Objects.nonNull(pageWrap.getModel().getCarNo()),
                        Retention::getCarNo,pageWrap.getModel().getCarNo())
                .like(Objects.nonNull(pageWrap.getModel().getCategoryName()),
                        Retention::getCategoryName,pageWrap.getModel().getCategoryName())
                .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                        Retention::getCreateDate,pageWrap.getModel().getStartTime())
                .le(Objects.nonNull(pageWrap.getModel().getEndTime()),

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

@@ -896,38 +896,41 @@
        List<Member> addList = new ArrayList<>();
        List<Member> editList = new ArrayList<>();
        //申请人信息
        Member m = getMemberListParam(visits.getIdcardNo(),visits,addList,editList);
        Member m = getMemberListParam(visits.getPhone(),visits.getIdcardNo(),visits,addList,editList);
        //随访人员信息处理
        if(visits.getWithUserList()!= null && visits.getWithUserList().size()>0){
            for(Visits model:visits.getWithUserList()){
                model.setBirthday(Constants.getBirthdyByCardNo(model.getIdcardNo()));
                model.setStarttime(visits.getStarttime());
                model.setEndtime(visits.getEndtime());
                //校验随访人员填报数据合法性
                isValidWithVisitParam(model,addList,editList);
                model.setCreateDate(visits.getCreateDate());
                Member visitsMember = getMemberListParam(model.getIdcardNo(),model,addList,editList);
                model.setMemberId(visitsMember.getId());
            }
        }
//        if(visits.getWithUserList()!= null && visits.getWithUserList().size()>0){
//            for(Visits model:visits.getWithUserList()){
//                model.setBirthday(Constants.getBirthdyByCardNo(model.getIdcardNo()));
//                model.setStarttime(visits.getStarttime());
//                model.setEndtime(visits.getEndtime());
//                //校验随访人员填报数据合法性
//                isValidWithVisitParam(model,addList,editList);
//                model.setCreateDate(visits.getCreateDate());
//                Member visitsMember = getMemberListParam(model.getIdcardNo(),model,addList,editList);
//                model.setMemberId(visitsMember.getId());
//            }
//        }
        return  m;
    }

    private Member getMemberListParam(String cardno, Visits visits, List<Member> addList, List<Member> editList) {
    private Member getMemberListParam(String phone,String cardno, Visits visits, List<Member> addList, List<Member> editList) {
        if(StringUtils.isNotBlank(visits.getCarNos())
                &&Objects.isNull(Constants.getVehiclePlateNo(visits.getCarNos()))
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，车牌号【"+visits.getCarNos()+"】不合法，请核实后重试~");
        }
        if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18
            //&&!IdcardUtil.isValidCard(cardno)
        ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证【"+cardno+"】号码有误，请核实后重试！");
        }

//        if(StringUtils.isNotBlank(cardno)&&Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18
//            //&&!IdcardUtil.isValidCard(cardno)
//        ){
//            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证【"+cardno+"】号码有误，请核实后重试！");
//        }
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
                .eq(Member::getType,Constants.memberType.visitor)
                .eq(Member::getIdcardType,visits.getIdcardType())
                .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, cardno)).last("limit 1" )
                .eq(Member::getPhone,phone)
//                .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, cardno))
                .last("limit 1" )
        );
        if(member == null){
            member = new Member();
@@ -935,12 +938,14 @@
            member.setCreateDate(visits.getCreateDate());
            member.setIsdeleted(Constants.ZERO);
            member.setIdcardNo(visits.getIdcardNo());
            member.setBirthday(Constants.getBirthdyByCardNo(cardno));
            member.setIdcardDecode(visits.getIdcardDecode());
            member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//身份证号加密
            member.setIdcardDecode(Constants.getTuominStr(cardno));//脱敏手机号
            if(StringUtils.isNotBlank(cardno)){
                member.setBirthday(Constants.getBirthdyByCardNo(cardno));
                member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//身份证号加密
                member.setIdcardDecode(Constants.getTuominStr(cardno));//脱敏手机号
                member.setSex(Constants.getSexByCardNo(cardno));
            }
            member.setFaceImg(visits.getFaceImg());
            member.setSex(Constants.getSexByCardNo(cardno));
            member.setImgurl(StringUtils.isNotBlank(visits.getImgurl())?visits.getImgurl():null);
            member.setIdcardType(visits.getIdcardType());
            member.setName(visits.getName());
@@ -948,7 +953,6 @@
            member.setOpenid(visits.getOpenid());
            member.setType(Constants.memberType.visitor);
            member.setStatus(Constants.ZERO);
            member.setSex(Constants.getSexByCardNo(cardno));
            member.setHkStatus(Constants.ZERO);
            member.setErpStatus(Constants.ZERO);
            member.setVisitCompanyName(visits.getCompanyName());
@@ -958,7 +962,7 @@
        }else{
            if(!Constants.equalsInteger(Constants.ZERO,member.getStatus() )){
                //如果用户状态异常，则提示
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，【"+member.getName()+"】身份证号【"+cardno+"】在黑名单内，无法申请进入园区");
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，【"+member.getName()+"】在黑名单内，无法申请进入园区");
            }
            //核查预约用户是否存在未签离的预约记录
//            isExsitNoOutVisisRecord(member);
@@ -966,13 +970,15 @@
            member.setImgurl(StringUtils.isNotBlank(visits.getImgurl())?visits.getImgurl():null);
            member.setEditDate(visits.getCreateDate());
            member.setIsdeleted(Constants.ZERO);
            member.setSex(Constants.getSexByCardNo(cardno));
            member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//身份证号加密
            member.setIdcardDecode(Constants.getTuominStr(cardno));//脱敏身份证号
            if(StringUtils.isNotBlank(cardno)){
                member.setBirthday(Constants.getBirthdyByCardNo(cardno));
                member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//身份证号加密
                member.setIdcardDecode(Constants.getTuominStr(cardno));//脱敏手机号
                member.setSex(Constants.getSexByCardNo(cardno));
            }
            member.setName(visits.getName());
            member.setPhone(visits.getPhone());
            member.setOpenid(visits.getOpenid());
            member.setSex(Constants.getSexByCardNo(cardno));
            member.setHkStatus(Constants.ZERO);
            member.setErpStatus(Constants.ZERO);
            member.setVisitCompanyName(visits.getCompanyName());
@@ -986,16 +992,14 @@
                                ,Constants.VisitStatus.xfFail
                                ,Constants.VisitStatus.signout
                                ,Constants.VisitStatus.invalid)
                .eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno))
                .and(ms -> ms.eq(Visits::getPhone, visits.getPhone())
                        .or().eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno)))
                .and(ms -> ms.eq(Visits::getPhone, visits.getPhone()))
                .and(ms -> ms.apply(" visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' ")
                        .or().apply(" visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ")
                        .or().apply(" visits.STARTTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ")
                        .or().apply(" visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ")
                )
        ) > Constants.ZERO) {
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，手机号【"+member.getPhone()+"】或身份证【"+ member.getIdcardDecode() +"】存在预约时间冲突，无法申请哦！");
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，手机号【"+member.getPhone()+"】存在预约时间冲突，无法申请哦！");
        }
        return  member;
    }