From 1ebbd7d5c83cc81e5cf94aa4d2a87a4ecd8a03c3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 03 三月 2022 10:04:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
index a3b3aad..1bb07a9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -5,6 +5,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -705,4 +706,57 @@
public R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId) {
return comBpActivityService.getTaskPbActivityPeopleList(activityId);
}
+
+ /**
+ * 分页查询党员数据统计
+ * @param statisticsMemberDto 请求参数
+ * @return 党员数据统计
+ */
+ @PostMapping("/pageDataStatisticsMember")
+ public R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto) {
+ return comPbMemberService.pageDataStatisticsMember(statisticsMemberDto);
+ }
+
+ /**
+ * 根据组织id查询组织下统计数据
+ * @param statisticsOrgDto 请求参数
+ * @return 组织下统计数据
+ */
+ @PostMapping("/getOrgDataStatistics")
+ public R getOrgDataStatistics(@RequestBody ComDataStatisticsOrgDto statisticsOrgDto) {
+ return comPbMemberService.getOrgDataStatistics(statisticsOrgDto);
+ }
+
+ /**
+ * 查询党组织表头统计数据
+ * @param communityId
+ * 社区id
+ * @return 党组织表头统计数据
+ */
+ @GetMapping("/getHeaderOrgDataStatistics")
+ public R getHeaderOrgDataStatistics(@RequestParam("communityId") Long communityId) {
+ return comPbMemberService.getHeaderOrgDataStatistics(communityId);
+ }
+
+ /**
+ * 党员数据统计-党员导出数据查询
+ * @param statisticsMemberDto 请求参数
+ * @return 党员导出数据
+ */
+ @PostMapping("/exportDataStatisticsMember")
+ public R exportDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto) {
+ return comPbMemberService.exportDataStatisticsMember(statisticsMemberDto);
+ }
+
+ /**
+ * 党委导入接口
+ * @param memberRoleExcelVoList 数据列表
+ * @param communityId 社区id
+ * @param userId 用户id
+ * @return 导入结果
+ */
+ @PostMapping("/importPbMemberRole")
+ public R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId){
+ return comPbMemberService.importPbMemberRole(memberRoleExcelVoList,communityId,userId);
+ }
}
--
Gitblit v1.7.1