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/CommunityApi.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 884b264..d75f8e1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -1,15 +1,15 @@
 package com.panzhihua.applets.api;
 
 import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.*;
 import com.panzhihua.common.service.community.CommunityService;
 import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PageGroup;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -63,7 +63,7 @@
 
     @ApiOperation(value = "报名/取消报名社区活动")
     @PutMapping("signactivity")
-    public R signActivity(@RequestBody SignactivityVO signactivityVO){
+    public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO){
         Long userId = this.getUserId();
         signactivityVO.setUserId(userId);
         return communityService.signActivity(signactivityVO);
@@ -71,7 +71,7 @@
 
     @ApiOperation(value = "活动人员列表",response = ActivitySignVO.class)
     @ApiImplicitParam(name ="id",value = "社区活动主键",required = true)
-    @PostMapping("listactivitysign")
+    @GetMapping("listactivitysign")
     public R listActivitySign(@RequestParam("id") Long id){
         ActivitySignVO activitySignVO=new ActivitySignVO();
         activitySignVO.setActivityId(id);
@@ -96,6 +96,23 @@
         return communityService.addVolunteer(comMngVolunteerMngVO);
     }
 
+    @ApiOperation(value = "分页查询志愿者团队")
+    @PostMapping("pagevolunteer")
+    public R pageVolunteer(@RequestBody @Validated(PageGroup.class) PageVolunteerDTO pageVolunteerDTO){
+        Long communityId = this.getCommunityId();
+        ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
+        comMngVolunteerMngVO.setCommunityId(communityId);
+        comMngVolunteerMngVO.setPageNum(pageVolunteerDTO.getPageNum());
+        comMngVolunteerMngVO.setPageSize(pageVolunteerDTO.getPageSize());
+        return communityService.pageVolunteer(comMngVolunteerMngVO);
+    }
+
+    @ApiOperation(value = "志愿者详情",response = ComMngVolunteerMngAppletsVO.class)
+    @GetMapping("volunteer")
+    public R detailVolunteer(@RequestParam("id") Long id){
+        return communityService.detailVolunteer(id);
+    }
+
 
 }
 

--
Gitblit v1.7.1