Merge branch 'cedoodev' into test

CeDo

2021-05-19 89df93bcafe7601c28905d888536a05dccbd0195

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -1,9 +1,6 @@
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.*;
@@ -66,7 +63,7 @@
     * @return 编辑结果
     */
    @PostMapping("/partybuildIng/resetpartyorganization")
    R resetPartyOrganization(PartyOrganizationVO partyOrganizationVO);
    R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    
    /**
     * 删除党支部
@@ -74,7 +71,7 @@
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deletepartyorganization")
    R deletePartyOrganization(PartyOrganizationVO partyOrganizationVO);
    R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    
    /**
     * 批量新增党员
@@ -364,7 +361,50 @@
    @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);
}