From c1e48a47b39dbd6919bfd9cf2e7023e9f3d6fee8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 05 十一月 2021 10:24:21 +0800
Subject: [PATCH] 1105测试代码修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index db78ba4..23e1580 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -250,8 +250,9 @@
     }
 
     @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();
@@ -260,7 +261,7 @@
         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);

--
Gitblit v1.7.1