productDev/dmvisit.git

			@@ -239,7 +239,7 @@
			//检查是否必须答题，并且符合答题要求
			ProblemLog problemLog = isValidProblemLog(visits,source);
			//获取申请的海康访问门禁组信息
			getHkDeviceRoles(visits,isERP);
			// getHkDeviceRoles(visits,isERP);
			//检验拜访人是否合法
			Member visitMember = isValideVisitedUser(visits.getReceptMemberId());
			if(StringUtils.isNotBlank(visits.getIdcardNo()) && Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())
			@@ -258,24 +258,6 @@
			//初始化访客信息
			initVisitInfo(visits,date);

			// if(StringUtils.isNotBlank(visits.getFaceImg())&&(Constants.equalsInteger(visits.getType(),Constants.ZERO)\|\| Constants.equalsInteger(visits.getType(),Constants.TWO))){
			// //人脸评分
			// FacePictureCheckRequest param = new FacePictureCheckRequest();
			// String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +
			// systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
			// param.setFacePicUrl(prefixUrl + visits.getFaceImg());
			// BaseResponse<FacePictureCheckResponse> response = HKService.facePictureCheck(param);
			// if(response == null \|\| !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
			// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，人脸评分获取数据失败~");
			// }
			// FacePictureCheckResponse facePictureCheckResponse = response.getData();
			// if(Objects.isNull(facePictureCheckResponse) \|\| Objects.isNull(facePictureCheckResponse.getCheckResult())){
			// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，人脸评分获取数据失败~");
			// }
			// if(!facePictureCheckResponse.getCheckResult()){
			// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), facePictureCheckResponse.getStatusMessage());
			// }
			// }
			visits.setSendTimeOutNotice(Constants.ZERO);
			visitsMapper.insert(visits);

			@@ -289,7 +271,7 @@
			}else{
			throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，发起拜访审批申请失败！");
			}
			}else if(dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO)){
			}else if(dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO) \|\| dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO)){
			visits.setStatus(Constants.VisitStatus.waitCheck);
			visitsMapper.updateById(visits);
			approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId(),member);
			@@ -1296,6 +1278,7 @@

			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.select(" ( select count(distinct(v.id)) from retention v where v.member_id = t.member_id and v.type=1 )",Visits::getRetentionNum);
			queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
			queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
			queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
			@@ -1603,9 +1586,9 @@
			if(Objects.isNull(visits)){
			throw new BusinessException(ResponseStatus.DATA_EMPTY);
			}
			if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
			/* if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无此操作权限");
			}
			}*/
			if(!StringUtils.equals(openid,visits.getOpenid())){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无此操作权限");
			}
			@@ -1869,7 +1852,8 @@
			pcWorkPlatformDataVO.setTodayOutUserNum(pcWorkPlatformDataVO.getLwUserOutNum() + pcWorkPlatformDataVO.getSignLevelNum() + inoutDayCount.getOutSelfMemberNum() );
			}

			}else if(Constants.equalsInteger(queryType,Constants.TWO)){
			}
			else if(Constants.equalsInteger(queryType,Constants.TWO)){
			List<String> weekDays = DateUtil.getBeforDays(new Date(),7);
			List<InterestedListVO> weekVisitList = new ArrayList<>();
			List<InterestedListVO> weekCarList = new ArrayList<>();
			@@ -1901,6 +1885,7 @@

			List<String> memberIds = inoutRecordList.stream().filter(i->
			Objects.isNull(i.getCarCode())
			&& Constants.equalsInteger(i.getMemberType(),Constants.ONE)
			&& Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
			&& Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
			)
			@@ -1916,6 +1901,8 @@


			visitVO.setName(days);
			weekVisitList.add(visitVO);

			InterestedListVO carVO = new InterestedListVO();
			carVO.setNum(Constants.ZERO);
			carVO.setName(days);
			@@ -1927,7 +1914,7 @@
			List<String> carCodeList = inoutRecordList.stream().filter(i->
			Objects.nonNull(i.getCarCode())
			&& Constants.equalsInteger(i.getInOrOut(),Constants.ZERO)
			&& Objects.isNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
			&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
			)
			.map(i->i.getCarCode())
			.collect(Collectors.toList());
			@@ -1936,9 +1923,8 @@
			}
			}
			if(Objects.isNull(carVO.getNum())){
			visitVO.setNum(Constants.ZERO);
			carVO.setNum(Constants.ZERO);
			}
			weekVisitList.add(visitVO);
			weekCarList.add(carVO);
			}
			pcWorkPlatformDataVO.setWeekVisitList(weekVisitList );
			@@ -1992,7 +1978,8 @@
			}
			pcWorkPlatformDataVO.setInternalList(internalList);
			pcWorkPlatformDataVO.setLwList(lwList);
			}else if(Constants.equalsInteger(queryType,Constants.THREE)) {
			}
			else if(Constants.equalsInteger(queryType,Constants.THREE)) {
			if (Objects.isNull(loginUserInfo.getMemberId())) {
			pcWorkPlatformDataVO.setNoticesList(new ArrayList<>());
			pcWorkPlatformDataVO.setNoticesNum(0);
			@@ -2015,7 +2002,8 @@
			}
			}

			}else{
			}
			else{
			String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
			MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
			queryWrapper.selectAll(Visits.class);