修改bug

huanghongfa

2021-07-28 bfe4eee11d2ba35c7e382377c117d13d9d98f64d

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

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

import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
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;

/**
@@ -27,9 +36,13 @@
    private PartyOrganizationService partyOrganizationService;
    @Resource
    private ComBpActivityService comBpActivityService;
    @Resource
    private ComPbServiceTeamService comPbServiceTeamService;
    @Resource
    private ComPbOrgDAO comPbOrgDAO;

    /**
     * 平台所有的党组织
     * 社区所有启用的党组织列表
     * @return 党组织集合
     */
    @PostMapping("listpartyorganization")
@@ -37,6 +50,58 @@
        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 党员基本信息
@@ -54,7 +119,20 @@
     */
    @PostMapping("listsavepartybuildingmemberexcelvo")
    public R listSavePartyBuildingMemberExcelVO(@RequestBody List<PartyBuildingMemberExcelVO> list){
        return  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;
        
    }

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

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

@@ -200,7 +277,7 @@
     * @return 详情
     */
    @PostMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Integer id){
    public R infoYnamic(@RequestParam("id") Long id){
        return  comPbMemberService.infoYnamic(id);
        
    }
@@ -318,11 +395,12 @@
    /**
     * 用户的所有党建活动
     * @param userId 用户id
     * @param communityId 社区id
     * @return  党建活动列表
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId){
        return  comBpActivityService.listActivity(userId);
    public R listActivity(@RequestParam("userId") Long userId,@RequestParam("communityId")Long communityId){
        return  comBpActivityService.listActivity(userId,communityId);
        
    }

@@ -346,4 +424,150 @@
        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);
    }
}