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;
			@@ -480,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 =
			@@ -487,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;
			// 查询当前活动下参与志愿者
			@@ -623,8 +625,9 @@
			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) {
			@@ -1138,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++){