| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @ApiOperation(value = "我的活动", response = ComActActivityVO.class) |
|---|
| | | @ApiImplicitParam(name = "status", value = "活动状态（4 进行中 5 已结束 6 已取消）", required = false) |
|---|
| | | @GetMapping("listactivity") |
|---|
| | | public R listActivity() { |
|---|
| | | public R listActivity(@RequestParam("status") Integer status) { |
|---|
| | | LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); |
|---|
| | | Long userId = loginUserInfo.getUserId(); |
|---|
| | | Long communityId = loginUserInfo.getCommunityId(); |
|---|
| | |
|---|
| | | if (R.isOk(r)) { |
|---|
| | | comActActivityVOS = (List<ComActActivityVO>)r.getData(); |
|---|
| | | } |
|---|
| | | R r1 = partyBuildingService.listActivity(userId, communityId); |
|---|
| | | R r1 = partyBuildingService.listActivity(userId, communityId, status); |
|---|
| | | if (R.isOk(r1)) { |
|---|
| | | List<ComActActivityVO> data = (List<ComActActivityVO>)r1.getData(); |
|---|
| | | comActActivityVOS.addAll(data); |
|---|
