活动

huanghongfa

2021-01-20 23e9f7463069b31b5455c0d85deec5245bd18359

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

@@ -221,8 +221,12 @@
            DateFormat formatTo = new SimpleDateFormat("M月d ahh:mm");
            records.forEach(partyBuildingActivityVO1 -> {
                Date activityTimeBegin = partyBuildingActivityVO1.getActivityTimeBegin();
                Integer status = partyBuildingActivityVO1.getStatus();
                if (!ObjectUtils.isEmpty(activityTimeBegin)) {
                    partyBuildingActivityVO1.setActivityTimeBeginFormat(formatTo.format(activityTimeBegin));
                }
                if(status.intValue()==3){
                    partyBuildingActivityVO1.setStatus(4);
                }
            });
        }
@@ -252,22 +256,32 @@
     * 用户的所有党建活动
     *
     * @param userId 用户id
     * @param communityId 社区id
     * @return 党建活动列表
     */
    @Override
    public R listActivity(Long userId) {
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getMemberId, userId));
    public R listActivity(Long userId, Long communityId) {
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        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));
        if (ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            return R.fail();
        }
        List<Long> collect = comPbActivityMemberDOS.stream().map(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId()).collect(Collectors.toList());
        List<ComPbActivityDO> comPbActivityDOS = comBpActivityDAO.selectBatchIds(collect);
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();

        comPbActivityDOS.forEach(comPbActivityDO -> {
            ComActActivityVO comActActivityVO = new ComActActivityVO();
            Integer status = comPbActivityDO.getStatus();
            if (status.intValue()==3) {
                status=4;
            }
            comActActivityVO.setType(3);
            comActActivityVO.setId(comPbActivityDO.getId());
            comActActivityVO.setStatus(comPbActivityDO.getStatus());
            comActActivityVO.setStatus(status);
            comActActivityVO.setActivityName(comPbActivityDO.getName());
            comActActivityVO.setCover(comPbActivityDO.getCover());
            comActActivityVO.setBeginAt(comPbActivityDO.getActivityTimeBegin());
@@ -292,6 +306,8 @@
            comPbMemberDOS.forEach(comPbMemberDO -> {
                PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
                BeanUtils.copyProperties(comPbMemberDO, partyBuildingMemberVO);
                ComPbActivityMemberDO comPbActivityMemberDO1 = comPbActivityMemberDOS.stream().filter(comPbActivityMemberDO -> comPbActivityMemberDO.getMemberId().equals(comPbMemberDO.getId())).collect(Collectors.toList()).get(0);
                partyBuildingMemberVO.setJoinTime(comPbActivityMemberDO1.getCreateAt());
                partyBuildingMemberVOS.add(partyBuildingMemberVO);
            });
        }