productDev/dmvisit.git

			@@ -558,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);
			@@ -785,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);
			@@ -795,7 +798,7 @@
			member.setEditDate(new Date());
			memberMapper.updateById(member);
			saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
			});
			});*/

			}

			@@ -1343,7 +1346,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);
			@@ -1453,7 +1456,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())