bugfixed：新增便民服务商家 报错

CeDo

2021-05-07 de91c84954157bb9f8b6d938cbe0b1b51fb6e65d

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

@@ -8,8 +8,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.RichTextUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_dangjian.dao.*;
@@ -53,7 +55,6 @@
    @Resource
    private ComPbDynUserDAO comPbDynUserDAO;


    private final String REDIS_ORG_ALL="ogrlist";

    /**
@@ -65,8 +66,9 @@
    @Override
    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)) {
        List<ComPbMemberDO> comPbMemberDOs = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda()
                .eq(ComPbMemberDO::getIdCard, idCard).eq(ComPbMemberDO::getAuditResult, 1));
        if (!ObjectUtils.isEmpty(comPbMemberDOs)&&comPbMemberDOs.size()>0) {
           return R.fail("身份证已经存在");
        }
        ComPbMemberDO comPbMemberDO1=new ComPbMemberDO();
@@ -76,6 +78,13 @@
        comPbMemberDO1.setUpdateAt(date);
        int insert = comPbMemberDAO.insert(comPbMemberDO1);
        if (insert>0) {
            //删除已驳回的记录
            int delete =  comPbMemberDAO.delete(new QueryWrapper<ComPbMemberDO>().lambda()
                    .eq(ComPbMemberDO::getIdCard, partyBuildingMemberVO.getIdCard())
                    .eq(ComPbMemberDO::getUserId, partyBuildingMemberVO.getUserId())
                    .eq(ComPbMemberDO::getCommunityId, partyBuildingMemberVO.getCommunityId())
                    .eq(ComPbMemberDO::getAuditResult, 3)
            );
            return R.ok();
        }
        return R.fail();
@@ -181,6 +190,7 @@
            partyBuildingMemberVO.setOrgId(null);
        }
        BeanUtils.copyProperties(partyBuildingMemberVO,comPbMemberDO);
        comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
        int i = comPbMemberDAO.updateById(comPbMemberDO);
        if (i>0) {
            return R.ok();
@@ -196,7 +206,8 @@
     */
    @Override
    public R listPartyMember(Long communityId) {
        List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getCommunityId,communityId));
        List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda()
                .eq(ComPbMemberDO::getCommunityId,communityId).eq(ComPbMemberDO::getAuditResult, 1));
//        查询社区所有已经注册的党员
//        排除掉已经成为党委的党员
//        List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectListRegister(communityId);
@@ -249,8 +260,9 @@
        ComPbMemberRoleDO comPbMemberRoleDOOld = comPbMemberRoleDAO.selectById(partyCommitteeVO.getId());
        comPbMemberRoleDO.setCreateAt(comPbMemberRoleDOOld.getCreateAt());
        comPbMemberRoleDO.setUpdateAt(new Date());
        comPbMemberRoleDO.setPositionTwo(partyCommitteeVO.getPositionTwo());
        comPbMemberRoleDO.setIsReg(2);
        PartyCommitteeVO oldPartyCommitteeVO = comPbMemberRoleDAO.selectPartyCommitteeById(partyCommitteeVO.getId());        
        PartyCommitteeVO oldPartyCommitteeVO = comPbMemberRoleDAO.selectPartyCommitteeById(partyCommitteeVO.getId());
        String oldphone = oldPartyCommitteeVO.getPhone();
        SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone);
        String newphone=partyCommitteeVO.getPhone();
@@ -351,24 +363,23 @@
     * @return 详情
     */
    @Override
    public R infoYnamic(Integer id) {
        ComPbDynDO comPbDynDO = comPbDynDAO.selectById(id);
        if (ObjectUtils.isEmpty(comPbDynDO)) {
    public R infoYnamic(Long id) {
        PartyBuildingComPbDynVO comPbDynVO = comPbDynDAO.selectVoById(id);
        if (ObjectUtils.isEmpty(comPbDynVO)) {
            return R.fail("动态不存在");
        }
        PartyBuildingComPbDynVO partyBuildingComPbDynVO=new PartyBuildingComPbDynVO();
        Long createBy = comPbDynDO.getCreateBy();
//        ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(createBy);
        String name = comPbMemberDAO.selectNameByUserId(createBy);
        if (ObjectUtils.isEmpty(name)) {
        //String name = comPbMemberDAO.selectNameByUserId(createBy);

        if (ObjectUtils.isEmpty(comPbDynVO.getCreateByName())) {
//            return R.fail("发布人不存在");
            String name = comPbMemberDAO.selectNameByUserId(comPbDynVO.getCreateBy());
            name="后台发布";
            comPbDynVO.setCreateByName(name);
        }
        Integer integer = comPbDynUserDAO.selectCount(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
        BeanUtils.copyProperties(comPbDynDO,partyBuildingComPbDynVO);
        partyBuildingComPbDynVO.setCreateByName(name);
        partyBuildingComPbDynVO.setReadingVolume(null==integer?0:integer);
        return R.ok(partyBuildingComPbDynVO);
        //Integer integer = comPbDynUserDAO.selectCount(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
        comPbDynVO.setReadingVolume(null==comPbDynVO.getReadingVolume()?0:comPbDynVO.getReadingVolume());
        return R.ok(comPbDynVO);
    }

    /**
@@ -427,15 +438,11 @@
     */
    @Override
    public R addDynUser(ComPbDynUserVO comPbDynUserVO) {
        ComPbDynUserDO comPbDynUserDO = comPbDynUserDAO.selectOne(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId,comPbDynUserVO.getDynId()).eq(ComPbDynUserDO::getUserId,comPbDynUserVO.getUserId()));
        if (ObjectUtils.isEmpty(comPbDynUserDO)) {
            comPbDynUserDO=new ComPbDynUserDO();
            BeanUtils.copyProperties(comPbDynUserVO,comPbDynUserDO);
            int insert = comPbDynUserDAO.insert(comPbDynUserDO);
            if (insert>0) {
                return R.ok();
            }
            return R.fail();
        ComPbDynUserDO comPbDynUserDO=new ComPbDynUserDO();
        BeanUtils.copyProperties(comPbDynUserVO,comPbDynUserDO);
        int insert = comPbDynUserDAO.insert(comPbDynUserDO);
        if (insert>0) {
            return R.ok();
        }
        return R.fail();
    }
@@ -488,9 +495,32 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PartyBuildingMemberVO> iPage=comPbMemberDAO.pagePartyBuildingMemberVO(page, pagePartyBuildingMemberVO);
        IPage<PartyBuildingMemberVO> iPage=comPbMemberDAO.pagePartyBuildingMembersVO(page, pagePartyBuildingMemberVO);

        return R.ok(iPage);
    }

    @Override
    public R updatePartyBuildingMembers(PartyBuildingMemberVO partyBuildingMemberVO){
        ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(partyBuildingMemberVO.getId());
        if(comPbMemberDO == null){
            return R.fail("未找到党员认证信息");
        }
        comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
        if(partyBuildingMemberVO.getAuditResult()!=null && partyBuildingMemberVO.getAuditResult().equals(1)){
            comPbMemberDO.setUpdateAt(new Date());
        }
        if (comPbMemberDAO.updateById(comPbMemberDO) > 0) {
            PartyBuildingMemberVO rtVO = new PartyBuildingMemberVO();
            BeanUtils.copyProperties(comPbMemberDO, rtVO);
            return R.ok(rtVO);
        }
        return R.fail();
    }

    @Override
    public R exportPbMember(PagePartyOrganizationVO organizationVO){
        return R.ok(comPbMemberDAO.exportPbMember(organizationVO));
    }

}