java/zhihuishenqu.git

			@@ -320,10 +320,7 @@
			List<ComActActEvaluateVO> comActActEvaluateVOS = JSONArray.parseArray(JSONArray.toJSONString(r3.getData()), ComActActEvaluateVO.class);
			collect.forEach(comActActivityVO -> {
			List<ComActActEvaluateVO> evaluateVOS=comActActEvaluateVOS.stream().filter(comActActEvaluateVO -> comActActEvaluateVO.getActivityId().equals(comActActivityVO.getId())).collect(toList());
			if(comActActivityVO.getSignCount()>evaluateVOS.size()){
			comActActivityVO.setIsComment(1);
			}
			else {
			if(comActActivityVO.getSignCount()<=evaluateVOS.size()){
			comActActivityVO.setIsComment(0);
			}
			});

			@@ -489,7 +489,7 @@
			// 查询当前活动下参与居民
			Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
			.eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
			if (activityType.equals(2)) {
			if (activityType.equals(1)) {
			//志愿者活动
			boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
			// 查询当前活动下参与志愿者
			@@ -628,6 +628,7 @@
			.filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId()))
			.collect(Collectors.toList());
			comActActivityVO.setSignCount(collect.size());
			comActActivityVO.setIsComment(1);
			ActivitySignVO activitySignVO = collect.get(0);
			Integer activityStatus = comActActivityVO.getStatus();
			if (activityStatus.intValue() == 3) {

	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史