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 |   51 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 33 insertions(+), 18 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 690d7fb..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;
@@ -28,34 +31,34 @@
     @ApiOperation(value = "分页党建动态/政策文件",response =PartyCommitteeVO.class )
     @PostMapping("pagedynamic")
     public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){
-        Long communityId=1l;//todo 获取社区id
+        Long communityId = this.getCommunityId();
         Integer type = partyBuildingComPbDynVO.getType();
         if (ObjectUtils.isEmpty(type)) {
             return R.fail("类型不能为空");
         }
         partyBuildingComPbDynVO.setCommunityId(communityId);
-        R r = partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
-        return r;
+        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
     }
 
     @ApiOperation(value = "分页查询党员活动",response = PageActivityMembersVO.class)
     @PostMapping("pageactivity")
     public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
-        R r = partyBuildingService.pageActivity(partyBuildingActivityVO);
-        return r;
+        Long communityId = this.getCommunityId();
+        partyBuildingActivityVO.setCommunityId(communityId);
+        return partyBuildingService.pageActivity(partyBuildingActivityVO);
     }
 
     @ApiOperation(value = "动态/政策文件详情",response =PartyBuildingComPbDynVO.class )
     @GetMapping("infodynamic")
     public R infoYnamic(@RequestParam("id") Long id) {
-        R r = partyBuildingService.infoYnamic(id);
-        return r;
+        return partyBuildingService.infoYnamic(id);
     }
 
     @ApiOperation(value = "增加阅读记录")
-    @GetMapping("adddynuser")
-    public R addDynUser(@RequestParam("id") Long id) {
-        if (ObjectUtils.isEmpty(id)) {
+    @PostMapping("adddynuser")
+    public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
+        Long id = partyBuildingComPbDynVO.getId();
+        if (ObjectUtils.isEmpty(id)||0==id) {
             return R.fail("主键id不能为空");
         }
         Long userId = this.getUserId();
@@ -63,26 +66,38 @@
         comPbDynUserVO.setCreateAt(new Date());
         comPbDynUserVO.setDynId(id);
         comPbDynUserVO.setUserId(userId);
-        R r = partyBuildingService.addDynUser(comPbDynUserVO);
-        return r;
+        return partyBuildingService.addDynUser(comPbDynUserVO);
     }
 
     @ApiOperation(value = "分页党委查询",response =PartyCommitteeVO.class )
     @PostMapping("pagepartycommittee")
     public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
-        //todo 获取用户的社区信息
-        Long communityId = 1l;
+        Long communityId =this.getCommunityId();
         partyCommitteeVO.setCommunityId(communityId);
-        R r = partyBuildingService.pagePartyCommittee(partyCommitteeVO);
-        return r;
+        return partyBuildingService.pagePartyCommittee(partyCommitteeVO);
     }
 
     @ApiOperation(value = "活动详情",response = PartyBuildingActivityVO.class)
     @GetMapping("activityinfo")
     public R activityinfo(@RequestParam("id") Long id) {
-        R r = partyBuildingService.activityinfo(id);
-        return r;
+        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