修改bug

huanghongfa

2021-07-28 bfe4eee11d2ba35c7e382377c117d13d9d98f64d

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

@@ -1,14 +1,24 @@
package com.panzhihua.service_dangjian.api;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.service_dangjian.dao.ComPbOrgDAO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.model.dos.ComPbOrgDO;
import com.panzhihua.service_dangjian.service.ComBpActivityService;
import com.panzhihua.service_dangjian.service.ComPbMemberService;
import com.panzhihua.service_dangjian.service.ComPbServiceTeamService;
import com.panzhihua.service_dangjian.service.PartyOrganizationService;
import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
@@ -26,16 +36,72 @@
    private PartyOrganizationService partyOrganizationService;
    @Resource
    private ComBpActivityService comBpActivityService;
    @Resource
    private ComPbServiceTeamService comPbServiceTeamService;
    @Resource
    private ComPbOrgDAO comPbOrgDAO;

    /**
     * 平台所有的党组织
     * 社区所有启用的党组织列表
     * @return 党组织集合
     */
    @PostMapping("listpartyorganization")
    public R listPartyOrganization(){
        List<PartyOrganizationVO> partyOrganizationVOS=partyOrganizationService.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("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);
        
    }
    
    /**
     * 新增党员
     * @param partyBuildingMemberVO 党员基本信息
@@ -43,8 +109,8 @@
     */
    @PostMapping("addpartybuildingmember")
    public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
        R r=comPbMemberService.addPartyBuildingMember(partyBuildingMemberVO);
        return r;
        return  comPbMemberService.addPartyBuildingMember(partyBuildingMemberVO);
        
    }

    /**
@@ -53,8 +119,21 @@
     */
    @PostMapping("listsavepartybuildingmemberexcelvo")
    public R listSavePartyBuildingMemberExcelVO(@RequestBody List<PartyBuildingMemberExcelVO> list){
        R r=comPbMemberService.listSavePartyBuildingMemberExcelVO(list);
        R r = null;
        try {
            r = comPbMemberService.listSavePartyBuildingMemberExcelVO(list);
        } catch (PartyBuildingMemberException e) {
            return R.fail(e.getMsg());
        }catch (Exception e) {
            e.printStackTrace();
            if (e.getMessage().contains("unique_id_card_community_id")) {
                return R.fail("身份证重复");
            }else  {
                return R.fail("导入失败");
            }
        }
        return r;
        
    }

    /**
@@ -64,8 +143,8 @@
     */
    @PostMapping("pagepartyorganization")
    public R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO){
        R r=comPbMemberService.pagePartyOrganization(pagePartyOrganizationVO);
        return r;
        return  comPbMemberService.pagePartyOrganization(pagePartyOrganizationVO);
        
    }

    /**
@@ -79,8 +158,8 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("党员id不能为空");
        }
        R r=comBpActivityService.listPartyMemberActivities(partyBuildingActivityVO);
        return r;
        return  comBpActivityService.listPartyMemberActivities(partyBuildingActivityVO);
        
    }

    /**
@@ -90,8 +169,8 @@
     */
    @PostMapping("pageactivitymembers")
    public R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO){
        R r=comBpActivityService.pageActivityMembers(pageActivityMembersVO);
        return r;
        return  comBpActivityService.pageActivityMembers(pageActivityMembersVO);
        
    }

    /**
@@ -101,8 +180,7 @@
     */
    @PostMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
        R r=comPbMemberService.updatePartyBuildingMember(partyBuildingMemberVO);
        return r;
        return  comPbMemberService.updatePartyBuildingMembers(partyBuildingMemberVO);
    }

    /**
@@ -111,9 +189,9 @@
     * @return 活动详情内容
     */
    @PostMapping("activityinfo")
    public R activityinfo(@RequestParam("id") Long id){
        R r=comBpActivityService.activityinfo(id);
        return r;
    public R activityinfo(@RequestParam("id") Long id,@RequestParam("userId") Long userId){
        return  comBpActivityService.activityinfo(id,userId);
        
    }

    /**
@@ -123,8 +201,8 @@
     */
    @PostMapping("listPartyMember")
    public R listPartyMember(@RequestParam("communityId")Long communityId){
        R r=comPbMemberService.listPartyMember(communityId);
        return r;
        return  comPbMemberService.listPartyMember(communityId);
        
    }

    /**
@@ -134,8 +212,8 @@
     */
    @PostMapping("addpartycommittee")
    public R addPartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){
        R r=comPbMemberService.addPartyCommittee(partyCommitteeVO);
        return r;
        return  comPbMemberService.addPartyCommittee(partyCommitteeVO);
        
    }

    /**
@@ -145,8 +223,8 @@
     */
    @PostMapping("updatepartycommittee")
    public R updatePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){
        R r=comPbMemberService.updatePartyCommittee(partyCommitteeVO);
        return r;
        return  comPbMemberService.updatePartyCommittee(partyCommitteeVO);
        
    }

    /**
@@ -156,8 +234,8 @@
     */
    @PostMapping("deletepartycommittee")
    public R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){
        R r=comPbMemberService.deletePartyCommittee(partyCommitteeVO);
        return r;
        return  comPbMemberService.deletePartyCommittee(partyCommitteeVO);
        
    }

    /**
@@ -167,8 +245,8 @@
     */
    @PostMapping("pagepartycommittee")
    public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){
        R r=comPbMemberService.pagePartyCommittee(partyCommitteeVO);
        return r;
        return  comPbMemberService.pagePartyCommittee(partyCommitteeVO);
        
    }

    /**
@@ -178,8 +256,8 @@
     */
    @PostMapping("adddynamic")
    public R adddYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO){
        R r=comPbMemberService.adddYnamic(partyCommitteeVO);
        return r;
        return  comPbMemberService.adddYnamic(partyCommitteeVO);
        
    }

    /**
@@ -189,8 +267,8 @@
     */
    @PostMapping("updatedynamic")
    public R updateYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO){
        R r=comPbMemberService.updateYnamic(partyCommitteeVO);
        return r;
        return  comPbMemberService.updateYnamic(partyCommitteeVO);
        
    }

    /**
@@ -199,9 +277,9 @@
     * @return 详情
     */
    @PostMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Integer id){
        R r=comPbMemberService.infoYnamic(id);
        return r;
    public R infoYnamic(@RequestParam("id") Long id){
        return  comPbMemberService.infoYnamic(id);
        
    }

    /**
@@ -211,8 +289,8 @@
     */
    @PostMapping("pagedynamic")
    public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){
        R r=comPbMemberService.pageYnamic(partyBuildingComPbDynVO);
        return r;
        return  comPbMemberService.pageYnamic(partyBuildingComPbDynVO);
        
    }

    /**
@@ -222,8 +300,8 @@
     */
    @PostMapping("deletedynamic")
    public R deleteYnamic(@RequestParam("id") Integer id){
        R r=comPbMemberService.deleteYnamic(id);
        return r;
        return  comPbMemberService.deleteYnamic(id);
        
    }

    /**
@@ -233,8 +311,8 @@
     */
    @PostMapping("addactivity")
    public R addactivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){
        R r=comBpActivityService.addactivity(partyBuildingActivityVO);
        return r;
        return  comBpActivityService.addactivity(partyBuildingActivityVO);
        
    }

    /**
@@ -244,8 +322,8 @@
     */
    @PostMapping("updateactivity")
    public R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){
        R r=comBpActivityService.updateActivity(partyBuildingActivityVO);
        return r;
        return  comBpActivityService.updateActivity(partyBuildingActivityVO);
        
    }

    /**
@@ -255,8 +333,8 @@
     */
    @PostMapping("releaseactivity")
    public R releaseActivity(@RequestParam("id") Long id){
        R r=comBpActivityService.releaseActivity(id);
        return r;
        return  comBpActivityService.releaseActivity(id);
        
    }

    /**
@@ -266,8 +344,8 @@
     */
    @PostMapping("deleteactivity")
    public R deleteActivity(@RequestParam("id") Long id){
        R r=comBpActivityService.deleteActivity(id);
        return r;
        return  comBpActivityService.deleteActivity(id);
        
    }

    /**
@@ -277,8 +355,8 @@
     */
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){
        R r=comBpActivityService.pageActivity(partyBuildingActivityVO);
        return r;
        return  comBpActivityService.pageActivity(partyBuildingActivityVO);
        
    }

    /**
@@ -288,8 +366,8 @@
     */
    @PostMapping("adddynuser")
    public R addDynUser(@RequestBody ComPbDynUserVO comPbDynUserVO){
        R r=comPbMemberService.addDynUser(comPbDynUserVO);
        return r;
        return  comPbMemberService.addDynUser(comPbDynUserVO);
        
    }

    /**
@@ -299,8 +377,8 @@
     */
    @PostMapping("deletepartybuildingmember")
    public R deleteDynUser(@RequestParam("id") Integer id){
        R r=comPbMemberService.deleteDynUser(id);
        return r;
        return  comPbMemberService.deleteDynUser(id);
        
    }

    /**
@@ -310,19 +388,186 @@
     */
    @PostMapping("cancelactivity")
    public R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){
        R r=comBpActivityService.cancelActivity(partyBuildingActivityVO);
        return r;
        return  comBpActivityService.cancelActivity(partyBuildingActivityVO);
        
    }

    /**
     * 用户的所有党建活动
     * @param userId 用户id
     * @param communityId 社区id
     * @return  党建活动列表
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId){
        R r=comBpActivityService.listActivity(userId);
        return r;
    public R listActivity(@RequestParam("userId") Long userId,@RequestParam("communityId")Long communityId){
        return  comBpActivityService.listActivity(userId,communityId);
        
    }

    /**
     * 党员活动人员参入列表
     * @param id 活动id
     * @return 党员集合
     */
    @PostMapping("listpartybuildingmember")
    public R listPartyBuildingMember(@RequestParam("id")Long id){
        return  comBpActivityService.listPartyBuildingMember(id);
    }

    /**
     * 报名、取消报名党员活动
     * @param activitySignUpDTO 操作参数
     * @return 操作结果
     */
    @PostMapping("putactivitysignup")
    public R putActivitySignUp(@RequestBody ActivitySignUpDTO activitySignUpDTO){
        return  comBpActivityService.putActivitySignUp(activitySignUpDTO);
    }

    /**
     * 获取党建活动所有参入人员的id集合
     * @param id 党建活动id
     * @return 人员id集合
     */
    @PostMapping("selectallpartybuildingactivitymembers")
    public R selectAllPartyBuildingActivityMembers(@RequestParam("id")Long id){
        return  comBpActivityService.selectAllPartyBuildingActivityMembers(id);
    }

    /**
     * 定时任务刷新党建动态发布状态
     * @return 刷新数据数量
     */
    @PostMapping("timedtaskpartybuildingstatus")
    R timedTaskPartyBuildingStatus(){
        return  comPbMemberService.timedTaskPartyBuildingStatus();
    }

    /**
     * 定时任务取消党建活动
     * @return 党建活动集合
     */
    @PostMapping("timedtaskpartybuildingactivity")
    public R timedTaskPartyBuildingActivity(){
        return comBpActivityService.timedTaskPartyBuildingActivity();
}

    /**
     * 定时任务刷新党建活动的各个状态 除取消外
     * @return  修改结果
     */
    @PostMapping("timedtaskpartybuildingactivityall")
    public R timedTaskPartyBuildingActivityAll(){
        return comBpActivityService.timedTaskPartyBuildingActivityAll();
    }

    /**
     * 新增服务团队人员
     * @param comPbServiceTeamDTO 新增内容
     * @return 新增结果
     */
    @PostMapping("addserviceteam")
    public R addServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO){
        return comPbServiceTeamService.addServiceTeam(comPbServiceTeamDTO);
    }

    /**
     * 编辑团队人员
     * @param comPbServiceTeamDTO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putserviceteam")
    public R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO){
        return comPbServiceTeamService.putServiceTeam(comPbServiceTeamDTO);
    }

    /**
     * 分页查询服务团队成员
     * @param pageComPbServiceTeamDTO 查询参数
     * @return 查询结果
     */
    @PostMapping("pageserviceteam")
    public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO){
        return comPbServiceTeamService.PageComPbServiceTeamDTO(pageComPbServiceTeamDTO);
    }

    /**
     * 删除服务团队人员
     * @param comPbServiceTeamDTO 删除主键
     * @return 删除结果
     */
    @PostMapping("deleteserviceteam")
    public R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO){
        return comPbServiceTeamService.deleteServiceTeam(comPbServiceTeamDTO);
    }

    /**
     * 创建党员活动 小程序创建党员活动
     * @param comPbActivityDTO 创建内容
     * @return 创建结果
     */
    @PostMapping("addactivityinfo")
    R addActivityApplets(@RequestBody ComPbActivityDTO comPbActivityDTO){
        return comBpActivityService.addActivityApplets(comPbActivityDTO);
    }

    /**
     * 查询用户认证信息
     * @param id 用户id
     * @return 查询结果
     */
    @GetMapping("usercertification")
    R userCertification(@RequestParam("id")Long id){
        List<ComPbMemberDO> comPbMemberDOList = comPbMemberService.list(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id));
        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);
    }


    /**
     * 查询用户认证信息
     * @param pagePartyBuildingMemberVO 查询参数
     * @return 查询结果
     */
    @PostMapping("pageusercertification")
    R pageUserCertification(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO){
        return comPbMemberService.pagePrePartyBuilingMember(pagePartyBuildingMemberVO);
    }

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

    /**
     * 根据党员认证id删除
     * @param id    党员认证id
     * @return  删除结果
     */
    @PostMapping("deleteprepartybuildingmember")
    public R deleteprepartybuildingmember(@RequestParam("id")Long id){
        return R.ok(comPbMemberService.removeById(id));
    }

    /**
     * 导出党员信息
     * @param organizationVO    请求参数
     * @return  党员信息列表
     */
    @PostMapping("exportPbMember")
    public R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO){
        return comPbMemberService.exportPbMember(organizationVO);
    }
}