整理

jiangping

2024-02-27 eaf169bd3379554b5f5b9052c76f7d82e5dcae17

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

@@ -127,6 +127,7 @@
        //访客信息(使用身份证号查询是否已存在改普通访客，没有则新增，存在则更新openid等信息),包括随访人员校验和处理
        Member member =dealMemberAndVisits(visits);
        visits.setMemberId(member.getId());
        visits.setVisitType(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MDJ_VISIT_REQUIRED).getCode()));
        //初始化访客信息
        initVisitInfo(visits,date);
        visitsMapper.insert(visits);
@@ -548,6 +549,8 @@
                v.setHkStatus(Constants.ZERO);
                v.setReason(visits.getReason());
                v.setDoors(visits.getDoors());
                v.setType(visits.getType());
                v.setVisitType(visits.getVisitType());
                v.setStatus(Constants.VisitStatus.submitCheck);
            }
            //批量插入数据
@@ -683,11 +686,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())
                &&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)
        ){
@@ -730,7 +733,9 @@
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，该身份证号被禁止访问申请，如有疑问，请联系您的拜访人进行核实");
            }
            //核查预约用户是否存在未签离的预约记录
            isExsitNoOutVisisRecord(member);

//            isExsitNoOutVisisRecord(member);

            member.setFaceImg(visits.getFaceImg());
            member.setImgurl(StringUtils.isNotBlank(visits.getImgurl())?visits.getImgurl():null);
            member.setEditDate(visits.getCreateDate());
@@ -751,9 +756,10 @@
        }
        //根据手机号和身份证号码查询 当前预约的时间是否与其他预约记录有冲突
        if (visitsMapper.selectCount(new QueryWrapper<Visits>().lambda()
                        .notIn(Visits::getStatus,Constants.VisitStatus.cancel,Constants.VisitStatus.cancel,Constants.VisitStatus.noPass,Constants.VisitStatus.xfFail)
                .and(ms -> ms.eq(Visits::getPhone, visits.getPhone())
                        .or().eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno)))
                        .notIn(Visits::getStatus,Constants.VisitStatus.cancel,Constants.VisitStatus.noPass,Constants.VisitStatus.xfFail)
//                .and(ms -> ms.eq(Visits::getPhone, visits.getPhone())
//                        .or().eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno)))
                .eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno))
                .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") + "' ")
                )) > Constants.ZERO) {
@@ -1071,6 +1077,7 @@
        VisitDetailVO visitDetailVO = new VisitDetailVO();
        visitDetailVO.setStatus(visits.getStatus());
        visitDetailVO.setCarNos(visits.getCarNos());
        visitDetailVO.setPhone(visits.getPhone());
        visitDetailVO.setVisitUserName(member.getName());
        visitDetailVO.setVisitReason(visits.getReason());
        visitDetailVO.setVisitTime(DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm") + " 至 " + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm") );