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;
@@ -781,6 +782,26 @@
        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("phone")String phone,@RequestParam("type")Integer type){
        return comPbMemberService.getPartyMember(phone,type);
@@ -792,11 +813,11 @@

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