党建接口测试ok

huanghongfa

2020-12-06 22c0fa7dfd9d558ac09b4239101b6ae47b085573

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

@@ -59,8 +59,8 @@
    public R addPartyBuildingMember(PartyBuildingMemberVO partyBuildingMemberVO) {
        String idCard = partyBuildingMemberVO.getIdCard();
        ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getIdCard, idCard));
        if (ObjectUtils.isEmpty(comPbMemberDO)) {
            throw new PartyBuildingMemberException("党员身份证重复");
        if (!ObjectUtils.isEmpty(comPbMemberDO)) {
           return R.fail("身份证已经存在");
        }
        ComPbMemberDO comPbMemberDO1=new ComPbMemberDO();
        BeanUtils.copyProperties(partyBuildingMemberVO,comPbMemberDO1);
@@ -116,9 +116,9 @@
                String orgName = partyBuildingMemberExcelVO.getOrgName();
                List<PartyOrganizationVO> collect = partyOrganizationVOArrayList.stream().filter(partyOrganizationVO -> orgName.equals(partyOrganizationVO.getName())).collect(Collectors.toList());
                if (ObjectUtils.isEmpty(collect)) {
                    throw new PartyBuildingMemberException("导入失败，组织不存在"+partyBuildingMemberExcelVO.getName());
                    throw new PartyBuildingMemberException("导入失败，组织不存在"+partyBuildingMemberExcelVO.getOrgName());
                }else{
                    comPbMemberDO.setArchivesId(Integer.parseInt(collect.get(0).getId()));
                    comPbMemberDO.setOrgId(Integer.parseInt(collect.get(0).getId()));
                }
                comPbMemberDO.setEmploymentTime(partyBuildingMemberExcelVO.getEmploymentTime());
                comPbMemberDO.setJoinTime(partyBuildingMemberExcelVO.getJoinTime());
@@ -146,10 +146,10 @@
        Page page=new Page<>();
        Long pageNum = pagePartyOrganizationVO.getPageNum();
        Long pageSize = pagePartyOrganizationVO.getPageSize();
        if (ObjectUtils.isEmpty(pageNum)) {
        if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
            pageNum=1l;
        }
        if (ObjectUtils.isEmpty(pageSize)) {
        if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
            pageSize=10l;
        }
        page.setSize(pageSize);
@@ -166,8 +166,11 @@
     */
    @Override
    public R updatePartyBuildingMember(PartyBuildingMemberVO partyBuildingMemberVO) {
        Integer id = partyBuildingMemberVO.getId();
        ComPbMemberDO comPbMemberDO=new ComPbMemberDO();
        Integer orgId = partyBuildingMemberVO.getOrgId();
        if (null!=orgId&&0==orgId) {
            partyBuildingMemberVO.setOrgId(null);
        }
        BeanUtils.copyProperties(partyBuildingMemberVO,comPbMemberDO);
        int i = comPbMemberDAO.updateById(comPbMemberDO);
        if (i>0) {
@@ -357,7 +360,7 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PartyCommitteeVO> iPage=comPbDynDAO.pageYnamic(page, partyBuildingComPbDynVO);
        IPage<PartyBuildingComPbDynVO> iPage=comPbDynDAO.pageYnamic(page, partyBuildingComPbDynVO);
        return R.ok(iPage);
    }

@@ -393,5 +396,22 @@
        return R.ok();
    }

    /**
     * 删除党员
     *
     * @param id 党员主键
     * @return 删除结果
     */
    @Override
    public R deleteDynUser(Integer id) {
        int delete = comPbMemberDAO.deleteById(id);
        if (delete>0) {
            return R.ok();
        }
        return R.fail();
    }




}