党支部修改

findyguo

2021-03-03 77eed2aebb91160482f84d04cb111a3ff7566b20

党支部修改

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

@@ -36,7 +36,7 @@
    private ComPbServiceTeamService comPbServiceTeamService;

    /**
     * 平台所有的党组织
     * 社区所有启用的党组织列表
     * @return 党组织集合
     */
    @PostMapping("listpartyorganization")
@@ -45,6 +45,59 @@
        return R.ok(partyOrganizationVOS);
    }
    /**
     * 社区所有党组织列表
     * @return 党组织集合
     */
    @PostMapping("listpartyorganizationAll")
    public R listPartyOrganizationAll(@RequestParam("communityId") Long communityId){
        List<PartyOrganizationVO> partyOrganizationVOS=partyOrganizationService.listPartyOrganizationAll(communityId);
        return R.ok(partyOrganizationVOS);
    }
    
    /**
     * 新增党支部
     * @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 党员基本信息
     * @return 新增结果

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbOrgDAO.java

@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_dangjian.model.dos.ComPbOrgDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党组织
@@ -12,4 +11,5 @@
 **/
@Mapper
public interface ComPbOrgDAO extends BaseMapper<ComPbOrgDO> {
	
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbOrgDO.java

@@ -42,4 +42,8 @@
     * 社区id
     */
    private Long communityId;
    /**
     * 状态 1 启用 2 禁用
     */
    private Integer status;
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/PartyOrganizationService.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_dangjian.service;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO;

import java.util.List;
@@ -12,8 +13,38 @@
 **/
public interface PartyOrganizationService {
    /**
     * 平台所有党组织
     * 平台所有启用的党组织
     * @return 党组织集合
     */
    List<PartyOrganizationVO> listPartyOrganization(Long communityId);
    /**
     * 平台所有的党组织
     * @return 党组织集合
     */
    List<PartyOrganizationVO> listPartyOrganizationAll(Long communityId);
    /**
     * 新增党支部
     * @param partyOrganizationVO 党支部基本信息
     * @return 新增结果
     */
    R addPartyOrganization(PartyOrganizationVO partyOrganizationVO);
    /**
     * 编辑党支部
     * @param partyOrganizationVO 党支部基本信息
     * @return 编辑结果
     */
    R updatePartyOrganization(PartyOrganizationVO partyOrganizationVO);
	
     /**
     * 启用，禁用党支部
     * @param partyOrganizationVO 党支部基本信息
     * @return 编辑结果
     */
    R resetPartyOrganization(PartyOrganizationVO partyOrganizationVO);
    /**
     * 删除党支部
     * @param partyOrganizationVO 党支部基本信息
     * @return 编辑结果
     */
    R deletePartyOrganization(PartyOrganizationVO partyOrganizationVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java

@@ -1,11 +1,18 @@
package com.panzhihua.service_dangjian.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO;
import com.panzhihua.service_dangjian.dao.ComPbMemberDAO;
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.PartyOrganizationService;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
@@ -22,23 +29,131 @@
public class PartyOrganizationServiceImpl implements PartyOrganizationService {
    @Resource
    private ComPbOrgDAO comPbOrgDAO;
    @Resource
    private ComPbMemberDAO comPbMemberDAO;

    /**
     * 平台所有党组织
     * 社区所有启用的党组织列表
     *
     * @return 党组织集合
     */
    @Override
    public List<PartyOrganizationVO> listPartyOrganization(Long communityId) {
        List<PartyOrganizationVO> partyOrganizationVOS=new ArrayList<>();
        List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(new QueryWrapper<ComPbOrgDO>().lambda().eq(ComPbOrgDO::getCommunityId,communityId));
        List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(new QueryWrapper<ComPbOrgDO>().lambda()
                .eq(ComPbOrgDO::getCommunityId, communityId).eq(ComPbOrgDO::getStatus, 1));
        if (!ObjectUtils.isEmpty(comPbOrgDOS)) {
            comPbOrgDOS.forEach(comPbOrgDO -> {
                PartyOrganizationVO partyOrganizationVO=new PartyOrganizationVO();
                partyOrganizationVO.setId(comPbOrgDO.getId());
                partyOrganizationVO.setName(comPbOrgDO.getName());
                partyOrganizationVO.setStatus(comPbOrgDO.getStatus());
                partyOrganizationVOS.add(partyOrganizationVO);
            });
        }
        return partyOrganizationVOS;
    }

    /**
     * 社区所有党组织列表
     *
     * @return 党组织集合
     */
    @Override
    public List<PartyOrganizationVO> listPartyOrganizationAll(Long communityId) {
        List<PartyOrganizationVO> partyOrganizationVOS = new ArrayList<>();
        List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO
                .selectList(new QueryWrapper<ComPbOrgDO>().lambda().eq(ComPbOrgDO::getCommunityId, communityId));
        if (!ObjectUtils.isEmpty(comPbOrgDOS)) {
            comPbOrgDOS.forEach(comPbOrgDO -> {
                PartyOrganizationVO partyOrganizationVO = new PartyOrganizationVO();
                List<ComPbMemberDO> comPbMemberDOs = comPbMemberDAO.selectList(
                        new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getOrgId, comPbOrgDO.getId()));
                partyOrganizationVO.setId(comPbOrgDO.getId());
                partyOrganizationVO.setName(comPbOrgDO.getName());
                partyOrganizationVO.setStatus(comPbOrgDO.getStatus());
                partyOrganizationVO.setCountPerson(comPbMemberDOs.size());
                partyOrganizationVOS.add(partyOrganizationVO);
            });
        }
        return partyOrganizationVOS;
    }

    /**
     * 新增党支部
     * 
     * @param partyOrganizationVO 党支部基本信息
     * @return 新增结果
     */
    @Override
    public R addPartyOrganization(PartyOrganizationVO partyOrganizationVO) {
        ComPbOrgDO comPbOrgDO = new ComPbOrgDO();
        BeanUtils.copyProperties(partyOrganizationVO, comPbOrgDO);
        comPbOrgDO.setLevel(1);
        comPbOrgDO.setParentId(0L);
        int insert = comPbOrgDAO.insert(comPbOrgDO);
        if (insert > 0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 编辑党支部
     * 
     * @param partyOrganizationVO 党支部基本信息
     * @return 编辑结果
     */
    @Override
    public R updatePartyOrganization(PartyOrganizationVO partyOrganizationVO) {
        ComPbOrgDO comPbOrgDO = new ComPbOrgDO();
        BeanUtils.copyProperties(partyOrganizationVO, comPbOrgDO);
        comPbOrgDO.setLevel(1);
        comPbOrgDO.setParentId(0L);
        int insert = comPbOrgDAO.updateById(comPbOrgDO);
        if (insert > 0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 启用，禁用党支部
     * 
     * @param partyOrganizationVO 党支部基本信息
     * @return 编辑结果
     */
    @Override
    public R resetPartyOrganization(PartyOrganizationVO partyOrganizationVO) {
        ComPbOrgDO comPbOrgDO = comPbOrgDAO.selectById(partyOrganizationVO.getId());
        if (ObjectUtils.isEmpty(comPbOrgDO)) {
            return R.fail("没有此党支部");
        }
        comPbOrgDO.setStatus(partyOrganizationVO.getStatus());
        int insert = comPbOrgDAO.updateById(comPbOrgDO);
        if (insert > 0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 删除党支部
     * 
     * @param partyOrganizationVO 党支部基本信息
     * @return 编辑结果
     */
    @Override
    public R deletePartyOrganization(PartyOrganizationVO partyOrganizationVO) {
        List<ComPbMemberDO> comPbMemberDOs = comPbMemberDAO.selectList(
                new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getOrgId, partyOrganizationVO.getId()));
        if (!CollectionUtils.isEmpty(comPbMemberDOs) && comPbMemberDOs.size() > 0) {
            return R.fail("该党组织下已有党员，不能删除！");
        }
        int insert = comPbOrgDAO.deleteById(partyOrganizationVO.getId());
        if (insert > 0) {
            return R.ok();
        }
        return R.fail();
    }
}