Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -5,6 +5,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -47,88 +48,88 @@
    @Resource
    private PartyBuildingService partyBuildingService;

    /**
     * 社区所有启用的党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("listpartyorganization")
    public R listPartyOrganization(@RequestParam("communityId") Long communityId) {
        List<PartyOrganizationVO> partyOrganizationVOS = partyOrganizationService.listPartyOrganization(communityId);
        return R.ok(partyOrganizationVOS);
    }

    /**
     * 分页查询社区所有党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("listpartyorganizationAll")
    public R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.listPartyOrganizationAll(partyOrganizationVO);
    }

    /**
     * 查询所有党组织列表
     * @param partyOrganizationVO   请求参数
     * @return  党组织列表
     */
    @PostMapping("getPbOrgAllList")
    public R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.getPbOrgAllList(partyOrganizationVO);
    }

    /**
     * 新增党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 新增结果
     */
    @PostMapping("addpartyorganization")
    public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.addPartyOrganization(partyOrganizationVO);

    }

    /**
     * 编辑党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("updatepartyorganization")
    public R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.updatePartyOrganization(partyOrganizationVO);

    }

    /**
     * 启用，禁用党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("resetpartyorganization")
    public R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.resetPartyOrganization(partyOrganizationVO);

    }

    /**
     * 删除党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("deletepartyorganization")
    public R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.deletePartyOrganization(partyOrganizationVO);

    }
//    /**
//     * 社区所有启用的党组织列表
//     *
//     * @return 党组织集合
//     */
//    @PostMapping("listpartyorganization")
//    public R listPartyOrganization(@RequestParam("communityId") Long communityId) {
//        List<PartyOrganizationVO> partyOrganizationVOS = partyOrganizationService.listPartyOrganization(communityId);
//        return R.ok(partyOrganizationVOS);
//    }
//
//    /**
//     * 分页查询社区所有党组织列表
//     *
//     * @return 党组织集合
//     */
//    @PostMapping("listpartyorganizationAll")
//    public R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.listPartyOrganizationAll(partyOrganizationVO);
//    }
//
//    /**
//     * 查询所有党组织列表
//     * @param partyOrganizationVO   请求参数
//     * @return  党组织列表
//     */
//    @PostMapping("getPbOrgAllList")
//    public R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.getPbOrgAllList(partyOrganizationVO);
//    }
//
//    /**
//     * 新增党支部
//     *
//     * @param partyOrganizationVO
//     *            党支部基本信息
//     * @return 新增结果
//     */
//    @PostMapping("addpartyorganization")
//    public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.addPartyOrganization(partyOrganizationVO);
//
//    }
//
//    /**
//     * 编辑党支部
//     *
//     * @param partyOrganizationVO
//     *            党支部基本信息
//     * @return 编辑结果
//     */
//    @PostMapping("updatepartyorganization")
//    public R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.updatePartyOrganization(partyOrganizationVO);
//
//    }
//
//    /**
//     * 启用，禁用党支部
//     *
//     * @param partyOrganizationVO
//     *            党支部基本信息
//     * @return 编辑结果
//     */
//    @PostMapping("resetpartyorganization")
//    public R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.resetPartyOrganization(partyOrganizationVO);
//
//    }
//
//    /**
//     * 删除党支部
//     *
//     * @param partyOrganizationVO
//     *            党支部基本信息
//     * @return 编辑结果
//     */
//    @PostMapping("deletepartyorganization")
//    public R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.deletePartyOrganization(partyOrganizationVO);
//
//    }

    /**
     * 新增党员
@@ -465,7 +466,7 @@
     * @return 删除结果
     */
    @PostMapping("deletepartybuildingmember")
    public R deleteDynUser(@RequestParam("id") Integer id) {
    public R deleteDynUser(@RequestParam("id") Long id) {
        return comPbMemberService.deleteDynUser(id);

    }
@@ -658,17 +659,17 @@
        return comPbMemberService.pagePrePartyBuilingMember(pagePartyBuildingMemberVO);
    }

    /**
     * 社区所有启用的党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("listpartyorganizationByApp")
    public R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO) {
        List<PartyOrganizationVO> partyOrganizationVOS =
            partyOrganizationService.listPartyOrganizationByApp(comListPartyDTO);
        return R.ok(partyOrganizationVOS);
    }
//    /**
//     * 社区所有启用的党组织列表
//     *
//     * @return 党组织集合
//     */
//    @PostMapping("listpartyorganizationByApp")
//    public R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO) {
//        List<PartyOrganizationVO> partyOrganizationVOS =
//            partyOrganizationService.listPartyOrganizationByApp(comListPartyDTO);
//        return R.ok(partyOrganizationVOS);
//    }

    /**
     * 根据党员认证id删除
@@ -781,12 +782,42 @@
        return comPbMemberService.getPagePbMember(partyBuildingMemberVO);
    }

    @PostMapping("/getProject")
    public R getProject(@RequestBody ProjectVO projectVO){
      return   comPbMemberService.getProject(projectVO);
    }

    @PostMapping("/addProject")
    public R addProject(@RequestBody ProjectVO projectVO){
        return comPbMemberService.addProject(projectVO);
    }

    @PostMapping("/updateProject")
    public R updateProject(@RequestBody ProjectVO projectVO){
        return comPbMemberService.updateProject(projectVO);
    }

    @PostMapping("/deleteProject")
    public R deleteProject(@RequestBody ProjectVO projectVO){
        return comPbMemberService.deleteProject(projectVO);
    }

    @GetMapping("/getPartyMember")
    public R getPartyMember(@RequestParam("userId")Long userId,@RequestParam("type")Integer type){
        return comPbMemberService.getPartyMember(userId,type);
    public R getPartyMember(@RequestParam("phone")String phone,@RequestParam("type")Integer type){
        return comPbMemberService.getPartyMember(phone,type);
    }
    @GetMapping("/memberDetail")
    public R memberDetail(@RequestParam("id")Long id){
        return comPbMemberService.memberDetail(id);
    }

    /**
     * 分页查询注册党员列表
     * @param pageMemberForInviteDTO
     * @return
     */
    @PostMapping("/page/registerMember")
    public R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO) {
        return comPbMemberService.pageRegisterMember(pageMemberForInviteDTO);
    }
}