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/service/ComPbMemberService.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
index e0c5d89..1e9a260 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
@@ -3,9 +3,14 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.dtos.partybuilding.ComDataStatisticsOrgDto;
+import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -191,4 +196,42 @@
* @return 党员信息列表
*/
R exportPbMember(PagePartyOrganizationVO organizationVO);
+
+ /**
+ * 分页查询党员数据统计
+ * @param statisticsMemberDto 请求参数
+ * @return 党员数据统计
+ */
+ R pageDataStatisticsMember(PageComDataStatisticsMemberDto statisticsMemberDto);
+
+ /**
+ * 根据组织id查询组织下统计数据
+ * @param statisticsOrgDto 请求参数
+ * @return 组织下统计数据
+ */
+ R getOrgDataStatistics(ComDataStatisticsOrgDto statisticsOrgDto);
+
+ /**
+ * 查询党组织表头统计数据
+ * @param communityId
+ * 社区id
+ * @return 党组织表头统计数据
+ */
+ R getHeaderOrgDataStatistics(Long communityId);
+
+ /**
+ * 党员数据统计-党员导出数据查询
+ * @param statisticsMemberDto 请求参数
+ * @return 党员导出数据
+ */
+ R exportDataStatisticsMember(PageComDataStatisticsMemberDto statisticsMemberDto);
+
+ /**
+ * 党委导入接口
+ * @param list 数据列表
+ * @param communityId 社区id
+ * @param userId 用户id
+ * @return 导入结果
+ */
+ R importPbMemberRole(List<ComPbMemberRoleExcelVo> list, Long communityId, Long userId);
}
--
Gitblit v1.7.1