|
@@ -192,13 +192,14 @@ public class FamilyController extends AppBaseController {
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
}
|
|
}
|
|
|
|
|
|
- @ApiOperation("通过申请")
|
|
|
|
|
|
+ @ApiOperation("通过/拒绝申请")
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParam(name = "memberId", value = "申请的成员id",paramType="Long"),
|
|
@ApiImplicitParam(name = "memberId", value = "申请的成员id",paramType="Long"),
|
|
- @ApiImplicitParam(name = "familyId", value = "家族id",paramType="Long")
|
|
|
|
|
|
+ @ApiImplicitParam(name = "familyId", value = "家族id",paramType="Long"),
|
|
|
|
+ @ApiImplicitParam(name = "status", value = "申请状态 2同意 3拒绝",paramType="String")
|
|
})
|
|
})
|
|
@GetMapping("/pass")
|
|
@GetMapping("/pass")
|
|
- public AjaxResult pass(Long memberId,Long familyId){
|
|
|
|
|
|
+ public AjaxResult pass(Long memberId,Long familyId, String status){
|
|
TbMemberMiddle middle = middleService.getOne(new LambdaQueryWrapper<TbMemberMiddle>()
|
|
TbMemberMiddle middle = middleService.getOne(new LambdaQueryWrapper<TbMemberMiddle>()
|
|
.eq(TbMemberMiddle::getFamilyId,familyId)
|
|
.eq(TbMemberMiddle::getFamilyId,familyId)
|
|
.eq(TbMemberMiddle::getMemberId,memberId)
|
|
.eq(TbMemberMiddle::getMemberId,memberId)
|
|
@@ -208,7 +209,8 @@ public class FamilyController extends AppBaseController {
|
|
if (middle == null) {
|
|
if (middle == null) {
|
|
return AjaxResult.error("查无申请信息");
|
|
return AjaxResult.error("查无申请信息");
|
|
}
|
|
}
|
|
- middle.setStatus("2"); //通过申请
|
|
|
|
|
|
+ // 通过/拒绝申请
|
|
|
|
+ middle.setStatus(status);
|
|
if(!middleService.updateById(middle)){
|
|
if(!middleService.updateById(middle)){
|
|
return AjaxResult.error("通过失败");
|
|
return AjaxResult.error("通过失败");
|
|
}
|
|
}
|