修改打卡

lidongdong

2023-11-14 ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c

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

@@ -5,7 +5,9 @@

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;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -46,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);
//
//    }

    /**
     * 新增党员
@@ -177,6 +179,19 @@
    @PostMapping("pagepartyorganization")
    public R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) {
        return comPbMemberService.pagePartyOrganization(pagePartyOrganizationVO);

    }

    /**
     * 查询党员信息导出
     *
     * @param pagePartyOrganizationVO
     *            查询信息
     * @return 分页数据
     */
    @PostMapping("exportPartyMember")
    public R exportPartyMember(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) {
        return comPbMemberService.exportPartyMember(pagePartyOrganizationVO);

    }

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

    }
@@ -620,15 +635,13 @@
     * @return 查询结果
     */
    @GetMapping("usercertification")
    R userCertification(@RequestParam("id") Long id) {
    R userCertification(@RequestParam("id") Long id,@RequestParam("communityId")Long communityId) {
        List<ComPbMemberDO> comPbMemberDOList =
            comPbMemberService.list(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id));
            comPbMemberService.list(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id).eq(ComPbMemberDO::getCommunityId,communityId));
        List<PartyBuildingMemberVO> partyBuildingMemberVOList = new ArrayList<>();
        comPbMemberDOList.forEach(comPbMemberDO -> {
            PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
            BeanUtils.copyProperties(comPbMemberDO, partyBuildingMemberVO);
            ComPbOrgDO comPbOrgDO = comPbOrgDAO.selectById(partyBuildingMemberVO.getOrgId());
            partyBuildingMemberVO.setOrgName(comPbOrgDO.getName());
            partyBuildingMemberVOList.add(partyBuildingMemberVO);
        });
        return R.ok(partyBuildingMemberVOList);
@@ -646,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删除
@@ -755,8 +768,36 @@
     * @param userId    用户id
     * @return  导入结果
     */
    @PostMapping("/partybuildIng/importPbMemberRole")
    @PostMapping("/importPbMemberRole")
    public R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId){
        return comPbMemberService.importPbMemberRole(memberRoleExcelVoList,communityId,userId);
    }
    @GetMapping("/checkMember")
    public R checkMember(@RequestParam("idCard")String idCard){
        return comPbMemberService.checkMember(idCard);
    }

    @PostMapping("/getPagePbMember")
    public R getPagePbMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
        return comPbMemberService.getPagePbMember(partyBuildingMemberVO);
    }

    @GetMapping("/getPartyMember")
    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);
    }
}