server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
@@ -33,14 +33,14 @@ @PreventRepeat @ApiOperation("新建") @PostMapping("/create") //@RequiresPermissions("business:membercard:create") @RequiresPermissions("business:membercard:create") public ApiResponse create(@RequestBody MemberCard memberCard) { return ApiResponse.success(memberCardService.create(memberCard)); } @ApiOperation("根据ID删除") @GetMapping("/delete/{id}") //@RequiresPermissions("business:membercard:delete") @RequiresPermissions("business:membercard:delete") public ApiResponse deleteById(@PathVariable Integer id) { memberCardService.deleteById(id); return ApiResponse.success(null); @@ -48,7 +48,7 @@ @ApiOperation("批量删除") @GetMapping("/delete/batch") //@RequiresPermissions("business:membercard:delete") @RequiresPermissions("business:membercard:delete") public ApiResponse deleteByIdInBatch(@RequestParam String ids) { String [] idArray = ids.split(","); List<Integer> idList = new ArrayList<>(); @@ -61,7 +61,7 @@ @ApiOperation("根据ID修改") @PostMapping("/updateById") //@RequiresPermissions("business:membercard:update") @RequiresPermissions("business:membercard:update") public ApiResponse updateById(@RequestBody MemberCard memberCard) { memberCardService.updateById(memberCard); return ApiResponse.success(null); @@ -69,7 +69,7 @@ @ApiOperation("挂失操作") @PostMapping("/batchLoss") //@RequiresPermissions("business:membercard:update") @RequiresPermissions("business:membercard:update") public ApiResponse batchLoss(@RequestBody List<MemberCard> memberCards) { memberCardService.updateByIdInBatch(memberCards,0); return ApiResponse.success(null); @@ -77,7 +77,7 @@ @ApiOperation("解挂操作") @PostMapping("/batchUnLoss") //@RequiresPermissions("business:membercard:update") @RequiresPermissions("business:membercard:update") public ApiResponse batchUnLoss(@RequestBody List<MemberCard> memberCards) { memberCardService.updateByIdInBatch(memberCards,1); return ApiResponse.success(null); @@ -85,7 +85,7 @@ @ApiOperation("退卡操作") @PostMapping("/refundCard") //@RequiresPermissions("business:membercard:update") @RequiresPermissions("business:membercard:update") public ApiResponse refundCard(@RequestBody MemberCard memberCard) { memberCardService.updateRefundCard(memberCard); return ApiResponse.success(null); @@ -93,7 +93,7 @@ @ApiOperation("分页查询") @PostMapping("/page") //@RequiresPermissions("business:membercard:query") @RequiresPermissions("business:membercard:query") public ApiResponse<PageData<MemberCard>> findPage (@RequestBody PageWrap<MemberCard> pageWrap) { return ApiResponse.success(memberCardService.findPage(pageWrap)); } server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -80,6 +80,15 @@ return ApiResponse.success(null); } @ApiOperation("员工权限下发") @GetMapping("/roleAuth/{id}") @RequiresPermissions("business:empower:create") public ApiResponse roleAuthById(@PathVariable Integer id) { memberService.roleAuthById(id); return ApiResponse.success(null); } @ApiOperation("根据ID修改") @PostMapping("/updateById") @RequiresPermissions("business:member:update") @@ -183,6 +192,8 @@ } /** * * 分页查询内部人员信息 server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -46,6 +46,8 @@ */ void deleteById(Integer id); void roleAuthById(Integer id); /** * 删除 * server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
@@ -125,6 +125,7 @@ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getSendStatus()),Empower::getSendStatus,pageWrap.getModel().getSendStatus()); queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId()); queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName()); queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDeviceName()),Device::getName,pageWrap.getModel().getDeviceName()); queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getSendStartDate()),Empower::getSendDate,pageWrap.getModel().getSendStartDate()); queryWrapper.le(Objects.nonNull(pageWrap.getModel().getSendEndDate()),Empower::getSendDate,pageWrap.getModel().getSendEndDate());
@@ -72,6 +72,8 @@ memberCard.setCreator(userInfo.getId()); memberCard.setCreateDate(new Date()); memberCard.setStatus(Constants.ONE); memberCard.setIsdeleted(Constants.ZERO); memberCard.setHkStatus(Constants.ZERO); memberCardMapper.insert(memberCard); dealMemberRoleEmpower(memberMapper.selectById(memberCard.getMemberId())); Member member = memberMapper.selectById(memberCard.getMemberId()); server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -179,6 +179,18 @@ memberMapper.updateById(member); } @Override public void roleAuthById(Integer id) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); Member member = memberMapper.selectById(id); } @Override public void delete(Member member) { UpdateWrapper<Member> deleteWrapper = new UpdateWrapper<>(member); @@ -603,7 +615,7 @@ queryWrapper.selectAll(Member.class); queryWrapper.selectAs(Company::getName,Member::getCompanyName); queryWrapper.select(" ( select count(1) from member_card mc where mc.member_id = t.id ) as memberCardCount "); queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and mc.member_id = t.id ) as memberCardCount "); queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId); queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0, Member::getCompanyId,pageWrap.getModel().getCompanyIds()) server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -1051,15 +1051,6 @@ if(param.getRoleIds()!=null && param.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，未查询到有效门禁组数据"); } //更新授权有效期 Member update = new Member(); update.setId(member.getId()); update.setEditDate(new Date()); update.setStartTime(param.getValidStartTime()); update.setEndTime(param.getValidEndTime()); update.setRoleId(StringUtils.isNotBlank(member.getRoleId())?member.getRoleId():null); update.setHkStatus(Constants.ZERO);//做一遍更新逻辑 update.setRemark("待同步安防平台"); memberMapper.update(null,new UpdateWrapper<Member>().lambda() .eq(Member::getId,member.getId()) .set(Member::getRoleId,member.getRoleId())
