From 9c5b811fb700bc66e66dbf38ed8733e57a4edac6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 09 三月 2022 09:19:14 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 4941a19..3d8188e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -8,6 +8,7 @@
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.model.dtos.property.CommonPage;
 import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
 import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
 import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
@@ -2573,4 +2574,23 @@
     public R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year){
         return comActActivityService.partyMemberCount(communityId,year);
     }
+
+    /**
+     * 党员活动详情数据
+     * @return
+     */
+    @PostMapping("activity/partyMemberDetail")
+    public R partyMemberDetail(@RequestBody CommonPage commonPage){
+        return comActActivityService.partyMemberDetail(commonPage);
+    }
+
+
+    /**
+     * 导出党员活动详情数据
+     * @return
+     */
+    @PostMapping("activity/exportPartyMemberDetail")
+    public R exportPartyMemberDetail(@RequestBody CommonPage commonPage){
+        return comActActivityService.exportPartyMemberDetail(commonPage);
+    }
 }

--
Gitblit v1.7.1