productDev/dmvisit.git

			@@ -337,12 +337,14 @@
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
			}
			if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
			.in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
			.eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
			.eq(Member::getIsdeleted,Constants.ZERO)) >0){
			throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNo()+"】已被使用，不能重复");
			}
			if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
			.eq(Member::getPhone, member.getPhone())
			.in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
			.eq(Member::getIsdeleted,Constants.ZERO) ) >0){
			throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "手机号【"+member.getPhone()+"】已被使用，不能重复");
			}
			@@ -392,6 +394,7 @@
			}
			if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
			.eq(Member::getPhone,member.getPhone())
			.in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
			.eq(Member::getIsdeleted,Constants.ZERO)
			.ne(Member::getId,member.getId())) >0){
			throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "手机号【"+member.getPhone()+"】已被使用，不能重复");
			@@ -406,6 +409,7 @@
			if( !StringUtils.equals(model.getIdcardNo(),encrptNo) ){
			if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
			.eq(Member::getIdcardNo,encrptNo)
			.in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
			.eq(Member::getIsdeleted,Constants.ZERO)
			.ne(Member::getId,member.getId())) >0){
			throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNoNew()+"】已被使用，不能重复");
			@@ -554,7 +558,7 @@
			public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
			Member member=new Member();
			member.setId(id);
			member.setIsdeleted(Constants.ZERO);
			member.setIsdeleted(Constants.ONE);
			member.setEditor(loginUserInfo.getId());
			member.setEditDate(new Date());
			member.setHkStatus(Constants.ZERO);
			@@ -781,7 +785,10 @@
			if (CollectionUtils.isEmpty(ids)) {
			return;
			}
			Member member=new Member();
			for(Integer id : ids){
			deleteById(id,loginUserInfo);
			}
			/* Member member=new Member();
			ids.stream().forEach(s ->{
			member.setId(s);
			member.setIsdeleted(Constants.ONE);
			@@ -791,7 +798,7 @@
			member.setEditDate(new Date());
			memberMapper.updateById(member);
			saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
			});
			});*/

			}

			@@ -932,6 +939,7 @@
			}

			public static void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper,String content) {
			updateMember.setEditDate(updateMember.getEditDate()==null?new Date():updateMember.getEditDate());
			UserAction userAction=new UserAction();
			userAction.setIsdeleted(Constants.ZERO);
			userAction.setCreateDate(updateMember.getEditDate());
			@@ -1075,6 +1083,7 @@
			update.setEditor(loginUserInfo.getId());
			update.setCanVisit(member.getCanVisit());
			memberMapper.updateById(update);
			member.setEditDate(update.getEditDate());
			//记录操作日志
			saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getCanVisit(),Constants.ONE)?Constants.UserActionType.CANVISIT:Constants.UserActionType.CANCEL_VISIT,userActionJoinMapper,null);
			}
			@@ -1339,7 +1348,7 @@
			public PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
			IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
			MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();

			pageWrap.getModel().setIsdeleted(Constants.formatIntegerNum(pageWrap.getModel().getIsdeleted()));
			queryWrapper.selectAll(Member.class);
			queryWrapper.selectAs(Company::getName,Member::getCompanyName);
			queryWrapper.selectAs(SystemUser::getRealname,Member::getEditorName);
			@@ -1449,7 +1458,7 @@
			queryWrapper.selectAll(Member.class)
			.selectAs(Company::getName,Member::getCompanyName)
			.selectAs(Member::getLastVisitDate,Member::getLastVisitDate)
			.select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status in (7,8) ) as visitsCount");
			.select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status in (7,8) ) as visitTimes");
			queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
			.like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
			.and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ms->ms.like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName())
			@@ -1590,7 +1599,7 @@
			.eq(Member::getType,Constants.memberType.internal)
			.eq(Member::getStatus,Constants.ZERO)
			.isNotNull(Member::getHkId)
			.apply("to_days(lastVisitDate)+ "+days+" < to_days(now())" ));
			.apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" ));
			if(CollectionUtils.isEmpty(memberList)){
			return;
			}
			@@ -2002,6 +2011,7 @@
			systemUser.setUsername(registerDriverDTO.getPhone());
			systemUser.setRealname(registerDriverDTO.getName());
			systemUser.setMemberId(member.getId());
			systemUser.setMobile(registerDriverDTO.getPhone());
			systemUser.setSalt(salt);
			systemUser.setPassword(member.getPassward());
			systemUser.setStatus(Constants.ZERO);