From 638cd80799c773176b1cbe9b142c699930c241fe Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 30 八月 2021 14:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 109 insertions(+), 7 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 605dcae..2f6bf66 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,13 +1,12 @@
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.*;
+import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -31,12 +30,50 @@
R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);
/**
- * 平台所有的党组织
+ * 社区所有启用的党组织列表
* @return 党组织集合
*/
@PostMapping("/partybuildIng/listpartyorganization")
R listPartyOrganization(@RequestParam("communityId") Long communityId);
-
+ /**
+ * 社区所有的党组织列表
+ * @return 党组织集合
+ */
+ @PostMapping("/partybuildIng/listpartyorganizationAll")
+ R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 新增党支部
+ * @param partyOrganizationVO 党支部基本信息
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIng/addpartyorganization")
+ R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 编辑党支部
+ * @param partyOrganizationVO 党支部基本信息
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIng/updatepartyorganization")
+ R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 启用，禁用党支部
+ * @param partyOrganizationVO 党支部基本信息
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIng/resetpartyorganization")
+ R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 删除党支部
+ * @param partyOrganizationVO 党支部基本信息
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIng/deletepartyorganization")
+ R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
/**
* 批量新增党员
* @param list 党员集合
@@ -128,7 +165,7 @@
*/
@PostMapping("/partybuildIng/pagepartycommittee")
R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
-
+
/**
* 新建党建动态
* @param partyCommitteeVO 动态内容
@@ -324,4 +361,69 @@
*/
@PostMapping("/partybuildIng/addactivityinfo")
R addActivityApplets(@RequestBody ComPbActivityDTO comPbActivityDTO);
+
+ /**
+ * 查询用户党员认证信息
+ * @param id 用户ID
+ * @return 查询结果
+ */
+ @GetMapping("/partybuildIng/usercertification")
+ R userCertification(@RequestParam("id") Long id);
+
+ /**
+ * 查询待认证党员信息
+ * @param pagePartyBuildingMemberVO 查询参数
+ * @return 查询结果
+ */
+ @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);
+
+
+ /**
+ * 选择人员
+ * @param param 查询条件
+ * @param communityId 社区id
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIng/getTotlePerson")
+ R getTotlePerson(@RequestParam(value = "param", required = false)String param, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 根据党员活动id查询活动下报名人员
+ * @param activityId 党员活动id
+ * @return 活动下报名人员
+ */
+ @PostMapping("/partybuildIng/getTaskPbActivityPeopleList")
+ R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId);
}
--
Gitblit v1.7.1