From b92edf56e7e25440e7c46b967aa5373a7a8b25c2 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 14 三月 2022 09:22:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
index d6aa233..bbd8745 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -112,6 +113,16 @@
*/
@PostMapping("/partybuildIng/pagepartyorganization")
R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);
+
+ /**
+ * 导出党员信息
+ *
+ * @param pagePartyOrganizationVO
+ * 查询信息
+ * @return 分页数据
+ */
+ @PostMapping("/partybuildIng/exportPartyMember")
+ R exportPartyMember(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);
/**
* 党员活动
@@ -564,4 +575,30 @@
*/
@GetMapping("/partybuildIng/getHeaderOrgDataStatistics")
R getHeaderOrgDataStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员数据统计-党员导出数据查询
+ * @param statisticsMemberDto 请求参数
+ * @return 党员导出数据
+ */
+ @PostMapping("/partybuildIng/exportDataStatisticsMember")
+ R exportDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);
+
+ /**
+ * 党委导入接口
+ * @param memberRoleExcelVoList 数据列表
+ * @param communityId 社区id
+ * @param userId 用户id
+ * @return 导入结果
+ */
+ @PostMapping("/partybuildIng/importPbMemberRole")
+ R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);
+
+ /**
+ * 身份证查询是否党员
+ * @param idCard
+ * @return
+ */
+ @GetMapping("/partybuildIng/checkMember")
+ R checkMember(@RequestParam("idCard")String idCard);
}
--
Gitblit v1.7.1