java/zhihuishenqu.git

			@@ -15,6 +15,7 @@

			import javax.annotation.Resource;

			import com.panzhihua.common.model.dtos.property.CommonPage;
			import com.panzhihua.common.model.vos.community.*;
			import org.apache.commons.lang3.time.DateUtils;
			import org.springframework.beans.BeanUtils;
			@@ -303,10 +304,22 @@
			comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
			}
			List<ComActActRegistDO> regList = comActActRegistDAO.selectList(new QueryWrapper<ComActActRegistDO>().lambda()
			.eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id).eq(ComActActRegistDO::getType, 1));
			.eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id));
			if (!regList.isEmpty()) {
			List<ComActActRegistDO> collect = regList.stream().sorted(Comparator.comparing(ComActActRegistDO::getId).reversed()).collect(Collectors.toList());
			comActActivityVO.setTimes(collect.get(0).getTimes());
			ComActActRegistDO comActActRegistDO=collect.get(0);
			if(comActActRegistDO.getType()==2){
			if(comActActRegistDO.getEndTime()==null){
			comActActivityVO.setSignType(2);
			}
			else {
			comActActivityVO.setSignType(1);
			}
			}
			}
			else {
			comActActivityVO.setSignType(1);
			}
			}
			}
			@@ -468,6 +481,7 @@
			return R.fail("已经报名过了，请勿重复提交");
			}
			Integer volunteerMax = actActivityDO.getVolunteerMax();
			Integer activityType = actActivityDO.getType();
			Integer residentMax = actActivityDO.getParticipantMax();
			R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(String.valueOf(userId));
			LoginUserInfoVO loginUserInfoVO =
			@@ -475,7 +489,7 @@
			// 查询当前活动下参与居民
			Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
			.eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
			if (volunteerMax != 0) {
			if (activityType.equals(2)) {
			//志愿者活动
			boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
			// 查询当前活动下参与志愿者
			@@ -585,7 +599,7 @@
			* @return 活动列表
			*/
			@Override
			public R listActivity(Long userId, Integer status) {
			public R listActivity(Long userId, Integer status,Integer type) {
			List<ActivitySignVO> activitySignVOList = comActActSignDAO.selectList(userId);
			if (ObjectUtils.isEmpty(activitySignVOList)) {
			return R.ok();
			@@ -603,13 +617,17 @@
			.filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
			}
			}
			if(isNull(type)){
			comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
			}
			if (!comActActivityDOS.isEmpty()) {
			comActActivityDOS.forEach(comActActivityDO -> {
			ComActActivityVO comActActivityVO = new ComActActivityVO();
			BeanUtils.copyProperties(comActActivityDO, comActActivityVO);
			List<ActivitySignVO> collect = activitySignVOList.stream()
			.filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId())).limit(1)
			.filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId()))
			.collect(Collectors.toList());
			comActActivityVO.setSignCount(collect.size());
			ActivitySignVO activitySignVO = collect.get(0);
			Integer isVolunteer = activitySignVO.getIsVolunteer();
			if (isVolunteer.intValue() == 1) {
			@@ -1123,6 +1141,17 @@
			partyActivityStatics.setPartyActivityLines(getPoints(communityId,year));
			return R.ok(partyActivityStatics);
			}

			@Override
			public R partyMemberDetail(CommonPage commonPage) {
			return R.ok(comActActivityDAO.partyMemberDetail(new Page<>(commonPage.getPage(),commonPage.getSize()),commonPage));
			}

			@Override
			public R exportPartyMemberDetail(CommonPage commonPage) {
			return R.ok(comActActivityDAO.exportPartyMemberDetail(commonPage));
			}

			public List<PartyActivityLine> getPoints(Long communityId,String year){
			List<PartyActivityLine> partyActivityLines=new ArrayList<>();
			for(int i=1;i<=12;i++){