From 5cc66034f6d2dba30d2132078b2730f1dd4abf86 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 31 七月 2021 21:00:56 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 201 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 196 insertions(+), 5 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 06c845f..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,9 +1,12 @@
package com.panzhihua.common.service.partybuilding;
+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;
@@ -27,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 党员集合
@@ -78,7 +119,7 @@
* @return 活动详情内容
*/
@PostMapping("/partybuildIng/activityinfo")
- R activityinfo(@RequestParam("id") Long id);
+ R activityinfo(@RequestParam("id") Long id,@RequestParam("userId") Long userId);
/**
* 查询指定社区的所有党员
@@ -124,7 +165,7 @@
*/
@PostMapping("/partybuildIng/pagepartycommittee")
R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
-
+
/**
* 新建党建动态
* @param partyCommitteeVO 动态内容
@@ -231,8 +272,158 @@
/**
* 用户的所有党建活动
* @param userId 用户id
+ * @param communityId 社区id 同一用户在不同社区都是党员
* @return 党建活动列表
*/
@PostMapping("/partybuildIng/listactivity")
- R listActivity(@RequestParam("userId") Long userId);
+ R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId")Long communityId);
+
+ /**
+ * 党员活动人员参入列表
+ * @param id 活动id
+ * @return 党员集合
+ */
+ @PostMapping("/partybuildIng/listpartybuildingmember")
+ R listPartyBuildingMember(@RequestParam("id")Long id);
+
+ /**
+ * 报名、取消报名党员活动
+ * @param activitySignUpDTO 操作参数
+ * @return 操作结果
+ */
+ @PostMapping("/partybuildIng/putactivitysignup")
+ R putActivitySignUp(@RequestBody ActivitySignUpDTO activitySignUpDTO);
+
+ /**
+ * 获取党建活动所有参入人员的id集合
+ * @param id 党建活动id
+ * @return 人员id集合
+ */
+ @PostMapping("/partybuildIng/selectallpartybuildingactivitymembers")
+ R selectAllPartyBuildingActivityMembers(@RequestParam("id")Long id);
+
+ /**
+ * 定时任务刷新党建动态发布状态
+ * @return 刷新数据数量
+ */
+ @PostMapping("/partybuildIng/timedtaskpartybuildingstatus")
+ R timedTaskPartyBuildingStatus();
+
+ /**
+ * 定时任务取消党建活动
+ * @return 需要取消的所有党建活动
+ */
+ @PostMapping("/partybuildIng/timedtaskpartybuildingactivity")
+ R timedTaskPartyBuildingActivity();
+
+ /**
+ * 定时任务刷新党建活动的各个状态 除取消外
+ * @return 修改结果
+ */
+ @PostMapping("/partybuildIng/timedtaskpartybuildingactivityall")
+ R timedTaskPartyBuildingActivityAll();
+
+ /**
+ * 新增服务团队人员
+ * @param comPbServiceTeamDTO 新增内容
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIng/addserviceteam")
+ R addServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
+
+ /**
+ * 编辑团队人员
+ * @param comPbServiceTeamDTO 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIng/putserviceteam")
+ R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
+
+ /**
+ * 删除服务团队人员
+ * @param comPbServiceTeamDTO 删除主键
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIng/deleteserviceteam")
+ R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
+ /**
+ * 分页查询服务团队成员
+ * @param pageComPbServiceTeamDTO 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIng/pageserviceteam")
+ R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO);
+
+ /**
+ * 创建党员活动 小程序创建党员活动
+ * @param comPbActivityDTO 创建内容
+ * @return 创建结果
+ */
+ @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