Merge remote-tracking branch 'origin/master' into master

hhhyyq

2021-03-17 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d

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

@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_dangjian.dao.ComBpActivityDAO;
import com.panzhihua.service_dangjian.dao.ComPbActivityMemberDAO;
import com.panzhihua.service_dangjian.dao.ComPbMemberDAO;
@@ -81,6 +82,9 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PageActivityMembersVO> iPage = comPbActivityMemberDAO.pageActivityMembers(page, pageActivityMembersVO);
        iPage.getRecords().forEach(record->{
            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
        });
        Map<String,Object> map=new HashMap<>(3);
        ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(activityId);
        map.put("page",iPage);
@@ -109,8 +113,26 @@
        }
        PartyBuildingActivityVO partyBuildingActivityVO = new PartyBuildingActivityVO();
        BeanUtils.copyProperties(comPbActivityDO, partyBuildingActivityVO);
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt));

        List<PartyBuildingMemberVO> partyBuildingMemberVOS = new ArrayList<>();
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt));
        if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            int size = comPbActivityMemberDOS.size();
            if (size>=6) {
                comPbActivityMemberDOS = comPbActivityMemberDOS.subList(0,6);
            }
            comPbActivityMemberDOS.forEach(member->{
                PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
                BeanUtils.copyProperties(member, partyBuildingMemberVO);
                partyBuildingMemberVO.setCreateAt(member.getCreateAt());
                partyBuildingMemberVOS.add(partyBuildingMemberVO);
            });
            partyBuildingActivityVO.setParticipationActualNum(comPbActivityMemberDOS.size());
        }else{
            partyBuildingActivityVO.setParticipationActualNum(0);
        }
        //List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt));
       /* List<PartyBuildingMemberVO> partyBuildingMemberVOS = new ArrayList<>();
        if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            List<Long> collect = comPbActivityMemberDOS.stream().map(ComPbActivityMemberDO::getMemberId).collect(Collectors.toList());
            int size = collect.size();
@@ -126,7 +148,7 @@
            partyBuildingActivityVO.setParticipationActualNum(size);
        } else {
            partyBuildingActivityVO.setParticipationActualNum(0);
        }
        }*/
        ComPbActivityMemberDO comPbActivityMemberDO=comPbActivityMemberDAO.selectByUserIdActivityId(id,userId);
        if (ObjectUtils.isEmpty(comPbActivityMemberDO)) {
            partyBuildingActivityVO.setIsSign(0);
@@ -280,11 +302,11 @@
    @Override
    public R listActivity(Long userId, Long communityId) {
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        Long memberId=comPbActivityMemberDAO.selectMemberIdByUserId(userId,communityId);
        /*Long memberId=comPbActivityMemberDAO.selectMemberIdByUserId(userId,communityId);
        if (ObjectUtils.isEmpty(memberId)) {
            return R.fail();
        }
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getMemberId, memberId));
        }*/
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getUserId, userId));
        if (ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            return R.fail();
        }
@@ -328,6 +350,14 @@
        List<PartyBuildingMemberVO> partyBuildingMemberVOS = new ArrayList<>();
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt));
        if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            comPbActivityMemberDOS.forEach(member->{
                PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
                BeanUtils.copyProperties(member, partyBuildingMemberVO);
                partyBuildingMemberVO.setCreateAt(member.getCreateAt());
                partyBuildingMemberVOS.add(partyBuildingMemberVO);
            });
        }
        /*if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            List<Long> collect = comPbActivityMemberDOS.stream().map(ComPbActivityMemberDO::getMemberId).collect(Collectors.toList());
            List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().in(ComPbMemberDO::getId, collect));
            comPbMemberDOS.forEach(comPbMemberDO -> {
@@ -337,7 +367,7 @@
                partyBuildingMemberVO.setCreateAt(comPbActivityMemberDO1.getCreateAt());
                partyBuildingMemberVOS.add(partyBuildingMemberVO);
            });
        }
        }*/
        return R.ok(partyBuildingMemberVOS);
    }

@@ -368,6 +398,10 @@
                ComPbActivityMemberDO comPbActivityMemberDO1=new ComPbActivityMemberDO();
                comPbActivityMemberDO1.setActivityId(id);
                comPbActivityMemberDO1.setMemberId(comPbMemberDO.getId());
                comPbActivityMemberDO1.setUserId(userId);
                //添加参加活动的党员快照信息，防止党员信息删除后无法显示
                comPbActivityMemberDO1.setName(comPbMemberDO.getName());
                comPbActivityMemberDO1.setPhotoPath(comPbMemberDO.getPhotoPath());
                comPbActivityMemberDO1.setCreateAt(new Date());
                mum=comPbActivityMemberDAO.insert(comPbActivityMemberDO1);
            } else {