From 1d21a9673d47a186bd189d9cceaa6e2ea17d293d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 15 六月 2021 14:55:44 +0800
Subject: [PATCH] Merge branch 'test'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 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 b555b53..3c81ade 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
@@ -1,9 +1,6 @@
package com.panzhihua.common.service.partybuilding;
-import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
-import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
-import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO;
-import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
+import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.*;
@@ -66,7 +63,7 @@
* @return 编辑结果
*/
@PostMapping("/partybuildIng/resetpartyorganization")
- R resetPartyOrganization(PartyOrganizationVO partyOrganizationVO);
+ R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
/**
* 删除党支部
@@ -74,7 +71,7 @@
* @return 删除结果
*/
@PostMapping("/partybuildIng/deletepartyorganization")
- R deletePartyOrganization(PartyOrganizationVO partyOrganizationVO);
+ R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
/**
* 批量新增党员
@@ -370,13 +367,44 @@
* @return 查询结果
*/
@GetMapping("/partybuildIng/usercertification")
- R userCertification(@RequestParam Long id);
+ R userCertification(@RequestParam("id") Long id);
/**
* 查询待认证党员信息
* @param pagePartyBuildingMemberVO 查询参数
* @return 查询结果
*/
- @GetMapping("/partybuildIng/pageusercertification")
- R pagePrePartybuildingmember(PagePartyBuildingMemberVO pagePartyBuildingMemberVO);
+ @PostMapping("/partybuildIng/pageusercertification")
+ R pagePrePartybuildingmember(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO);
+
+ /**
+ * 根据身份证号码查询党员信息
+ * @param idCard 身份证号码
+ * @return 党员信息
+ */
+ @PostMapping("/partybuildIng/getPartyBuildingByIdCard")
+ R getPartyBuildingByIdCard(@RequestParam("idCard") String idCard);
+
+ /**
+ * 社区所有启用的党组织列表
+ * @return 党组织集合
+ */
+ @PostMapping("/partybuildIng/listpartyorganizationByApp")
+ R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO);
+
+ /**
+ * 根据id删除党员认证
+ * @param id 党员认证id
+ * @return 党员认证id
+ */
+ @PostMapping("/partybuildIng/deleteprepartybuildingmember")
+ R deleteprepartybuildingmember(@RequestParam("id") Long id);
+
+ /**
+ * 导出党员信息
+ * @param organizationVO 请求参数
+ * @return 党员信息列表
+ */
+ @PostMapping("/partybuildIng/exportPbMember")
+ R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO);
}
--
Gitblit v1.7.1