From c5e8177c3fbc27ac825f38c465383903adb87596 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 01 十一月 2022 13:59:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 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 46330ed..b146e08 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.dtos.community.PageMemberForInviteDTO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -19,7 +20,7 @@
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2020-11-30 09:50
**/
-@FeignClient(value = "partybuilding")
+@FeignClient(value = "huacheng-partybuilding")
public interface PartyBuildingService {
/**
* 新增党员
@@ -113,6 +114,16 @@
*/
@PostMapping("/partybuildIng/pagepartyorganization")
R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);
+
+ /**
+ * 导出党员信息
+ *
+ * @param pagePartyOrganizationVO
+ * 查询信息
+ * @return 分页数据
+ */
+ @PostMapping("/partybuildIng/exportPartyMember")
+ R exportPartyMember(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);
/**
* 党员活动
@@ -464,11 +475,12 @@
* 查询用户党员认证信息
*
* @param id
+ * @param communityId
* 用户ID
* @return 查询结果
*/
@GetMapping("/partybuildIng/usercertification")
- R userCertification(@RequestParam("id") Long id);
+ R userCertification(@RequestParam("id") Long id,@RequestParam("communityId")Long communityId);
/**
* 查询待认证党员信息
@@ -583,4 +595,38 @@
*/
@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);
+
+ /**
+ * 小程序分页查询党员列表
+ * @param partyBuildingMemberVO 请求参数
+ * @return 党员列表
+ */
+ @PostMapping("/partybuildIng/getPagePbMember")
+ R getPagePbMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);
+
+
+ @GetMapping("/partybuildIng/getPartyMember")
+ public R getPartyMember(@RequestParam("phone")String phone,@RequestParam("type")Integer type);
+
+ @GetMapping("/partybuildIng/memberDetail")
+ public R memberDetail(@RequestParam("id")Long id);
+
+ @GetMapping("/comPbCheckUnit/detailByPhone")
+ public R detailByPhone(@RequestParam("phone") String phone);
+
+ /**
+ * 分页查询注册党员列表
+ * @param pageMemberForInviteDTO
+ * @return
+ */
+ @PostMapping("/partybuildIng/page/registerMember")
+ R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO);
}
--
Gitblit v1.7.1