From d9eee1919dbff7ffddc48b1f4fee2ec41a54a2a2 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 05 一月 2021 18:19:52 +0800
Subject: [PATCH] 运营后台完成

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index fea575c..869c9c0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -1,12 +1,15 @@
 package com.panzhihua.applets.api;
 
 import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.partybuilding.*;
 import com.panzhihua.common.service.partybuilding.PartyBuildingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -77,8 +80,24 @@
     @ApiOperation(value = "活动详情",response = PartyBuildingActivityVO.class)
     @GetMapping("activityinfo")
     public R activityinfo(@RequestParam("id") Long id) {
-        return partyBuildingService.activityinfo(id);
+        Long userId = this.getUserId();
+        return partyBuildingService.activityinfo(id,userId);
     }
 
+    @ApiOperation(value = "党员活动人员参入列表",response = PartyBuildingMemberVO.class)
+    @GetMapping("listpartybuildingmember")
+    public R listPartyBuildingMember(@RequestParam("id") Long id) {
+        return partyBuildingService.listPartyBuildingMember(id);
+    }
+
+    @ApiOperation(value = "报名、取消报名党员活动")
+    @PutMapping("activitysignup")
+    public R putActivitySignUp(@RequestBody @Validated ActivitySignUpDTO activitySignUpDTO) {
+        activitySignUpDTO.setUserId(this.getUserId());
+        return partyBuildingService.putActivitySignUp(activitySignUpDTO);
+    }
+
+
+
 
 }

--
Gitblit v1.7.1