From 85cf42314fc04a637f1a44e78c1e476a445bf0f3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 14 三月 2022 13:29:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 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 e7e29f1..4b57344 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,8 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -176,6 +178,19 @@
@PostMapping("pagepartyorganization")
public R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) {
return comPbMemberService.pagePartyOrganization(pagePartyOrganizationVO);
+
+ }
+
+ /**
+ * 查询党员信息导出
+ *
+ * @param pagePartyOrganizationVO
+ * 查询信息
+ * @return 分页数据
+ */
+ @PostMapping("exportPartyMember")
+ public R exportPartyMember(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) {
+ return comPbMemberService.exportPartyMember(pagePartyOrganizationVO);
}
@@ -736,4 +751,30 @@
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);
+ }
+ @GetMapping("/checkMember")
+ public R checkMember(@RequestParam("idCard")String idCard){
+ return comPbMemberService.checkMember(idCard);
+ }
}
--
Gitblit v1.7.1