server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -131,9 +131,8 @@ * 定时同步内部人员授权到海康系统 * @throws Exception */ @Scheduled(fixedDelay= 60*1000) @Scheduled(fixedDelay= 10*1000) public void syncEmpowerData() { hkSyncEmpowerService.syncEmpowerData(); } /** server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
@@ -146,7 +146,7 @@ queryWrapper.ge(Empower::getSendDate,cal.getTime()); } } queryWrapper.orderByDesc(Empower::getCreateDate); queryWrapper.orderByDesc(Empower::getId); IPage<Empower> result = empowerJoinMapper.selectJoinPage(page, Empower.class,queryWrapper); return PageData.from(result); } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -70,7 +70,7 @@ || StringUtils.isBlank(memberCard.getCode())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if(memberCard.getCode().length()<=8){ if(memberCard.getCode().length()<8){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"卡号需要大于8位"); } memberCard.setCreator(userInfo.getId()); server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -393,12 +393,22 @@ @Override public List<Member> findList(Member member) { QueryWrapper<Member> wrapper = new QueryWrapper<>(member); MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId); queryWrapper.selectAll(Member.class) .selectAs(Company::getName,MemberInfoDTO::getCompanyName) .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName); if(null != member.getType()) { wrapper.lambda().eq(Member::getType,member.getType()); queryWrapper.eq(Member::getType,member.getType()); } wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO); return memberMapper.selectList(wrapper); if(null != member.getCompanyId()) { queryWrapper.eq(Member::getCompanyId,member.getCompanyId()); } queryWrapper.eq(Member::getIsdeleted,Constants.ZERO); return memberJoinMapper.selectJoinList(Member.class,queryWrapper); } @Override server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -520,7 +520,9 @@ queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId); queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.wait); queryWrapper.eq( Empower::getIsdeleted,del); // queryWrapper.last("limit 100");//每次限制下发100个 queryWrapper.orderByAsc(Empower::getId ); queryWrapper.orderByAsc(Empower::getCreateDate ); queryWrapper.last("limit 100");//每次限制下发100个 List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper); return list; }