From c92c380b8f29ad485024d3d1948d0d0fce56b0d6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 13 四月 2022 20:48:47 +0800
Subject: [PATCH] 党员双报到,问题清单,需求清单,资源清单接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 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 1bb07a9..9e72e1b 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
@@ -6,6 +6,7 @@
 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.*;
@@ -177,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);
 
     }
 
@@ -620,9 +634,9 @@
      * @return 查询结果
      */
     @GetMapping("usercertification")
-    R userCertification(@RequestParam("id") Long id) {
+    R userCertification(@RequestParam("id") Long id,@RequestParam("communityId")Long communityId) {
         List<ComPbMemberDO> comPbMemberDOList =
-            comPbMemberService.list(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id));
+            comPbMemberService.list(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id).eq(ComPbMemberDO::getCommunityId,communityId));
         List<PartyBuildingMemberVO> partyBuildingMemberVOList = new ArrayList<>();
         comPbMemberDOList.forEach(comPbMemberDO -> {
             PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
@@ -759,4 +773,13 @@
     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);
+    }
+
+    @PostMapping("/getPagePbMember")
+    public R getPagePbMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
+        return comPbMemberService.getPagePbMember(partyBuildingMemberVO);
+    }
 }

--
Gitblit v1.7.1