From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001 From: CeDo <cedoogle@gmail.com> Date: 星期五, 07 五月 2021 15:23:57 +0800 Subject: [PATCH] bugfixed:新增便民服务商家 报错 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 97 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 90 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..3c81ade 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,11 @@ 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 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 +29,50 @@ R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO); /** - * 平台所有的党组织 + * 社区所有启用的党组织列表 * @return 党组织集合 */ @PostMapping("/partybuildIng/listpartyorganization") R listPartyOrganization(@RequestParam("communityId") Long communityId); - + /** + * 社区所有的党组织列表 + * @return 党组织集合 + */ + @PostMapping("/partybuildIng/listpartyorganizationAll") + R listPartyOrganizationAll(@RequestParam("communityId") Long communityId); + + /** + * 新增党支部 + * @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 +164,7 @@ */ @PostMapping("/partybuildIng/pagepartycommittee") R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO); - + /** * 新建党建动态 * @param partyCommitteeVO 动态内容 @@ -324,4 +360,51 @@ */ @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); } -- Gitblit v1.7.1