From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +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 | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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 eded3bb..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 {
/**
* 新增党员
@@ -602,4 +603,30 @@
*/
@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