productDev/dmvisit.git

			@@ -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,7 +686,7 @@
			}

			private Member getMemberListParam(String cardno, Visits visits, List<Member> addList, List<Member> editList) {
			if(!StringUtils.isNotBlank(visits.getCarNos())
			if(StringUtils.isNotBlank(visits.getCarNos())
			&&Objects.isNull(Constants.getVehiclePlateNo(visits.getCarNos()))
			){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，车牌号【"+visits.getCarNos()+"】不合法，请核实后重试~");
			@@ -691,7 +694,7 @@
			if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18
			//&&!IdcardUtil.isValidCard(cardno)
			){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证号码有误，请核实后重试！");
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证【"+cardno+"】号码有误，请核实后重试！");
			}
			Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
			.eq(Member::getType,Constants.memberType.visitor)
			@@ -727,10 +730,9 @@
			}else{
			if(!Constants.equalsInteger(Constants.ZERO,member.getStatus() )){
			//如果用户状态异常，则提示
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，该身份证号被禁止访问申请，如有疑问，请联系您的拜访人进行核实");
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，身份证号【"+cardno+"】被禁止访问申请，如有疑问，请联系您的拜访人进行核实");
			}
			//核查预约用户是否存在未签离的预约记录

			// isExsitNoOutVisisRecord(member);

			member.setFaceImg(visits.getFaceImg());
			@@ -748,14 +750,10 @@
			member.setErpStatus(Constants.ZERO);
			member.setVisitCompanyName(visits.getCompanyName());
			memberMapper.updateById(member);
			// 更新访客信息,
			// editList.add(member);
			}
			//根据手机号和身份证号码查询当前预约的时间是否与其他预约记录有冲突
			if (visitsMapper.selectCount(new QueryWrapper<Visits>().lambda()
			.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)))
			.notIn(Visits::getStatus,Constants.VisitStatus.cancel,Constants.VisitStatus.noPass,Constants.VisitStatus.xfFail,Constants.VisitStatus.signout,Constants.VisitStatus.invalid)
			.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") + "' ")
			@@ -1025,7 +1023,7 @@
			queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
			queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
			queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
			queryWrapper.leftJoin(" member m on m.id=t.MEMBER_ID");
			queryWrapper.leftJoin(" member m on m.id= t.MEMBER_ID");

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

			@@ -1035,11 +1033,9 @@
			queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
			queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Visits::getType,pageWrap.getModel().getType());
			queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()),ms->ms.like(Visits::getPhone,pageWrap.getModel().getName())
			.or().like(Visits::getPhone,pageWrap.getModel().getName()))
			.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(!Objects.nonNull(pageWrap.getModel().getLevelStatus()),Visits::getOutDate);
			.or().like(Visits::getName,pageWrap.getModel().getName()));
			queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Visits::getIdcardNo,StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()));
			queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Visits::getCompanyName,pageWrap.getModel().getCompanyName());
			queryWrapper.orderByDesc(Visits::getEditDate);
			IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);
			if(result!=null&&result.getRecords()!=null){
			@@ -1074,8 +1070,10 @@
			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.setQrcode(visits.getQrcode());
			visitDetailVO.setVisitTime(DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm") + " 至 " + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm") );
			//被访人员部门
			Company company = companyMapper.selectById(member.getCompanyId());
			@@ -1102,7 +1100,7 @@
			}
			visitDetailVO.setWithVisitsList(
			visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
			.select(Visits::getName,Visits::getPhone,Visits::getFaceImg,Visits::getImgurl,Visits::getIdcardDecode,Visits::getStatus)
			.select(Visits::getName,Visits::getPhone,Visits::getQrcode,Visits::getFaceImg,Visits::getImgurl,Visits::getIdcardDecode,Visits::getStatus)
			.eq(Visits::getParentId,id)));
			return visitDetailVO;
			}