java/zhihuishenqu.git

			@@ -271,11 +271,11 @@
			//查询当前活动下参与志愿者/居民数量
			Integer count = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getActivityId,activityId)
			.eq(ComActActSignDO::getIsVolunteer,isVolunteer));
			if(isVolunteer.equals(1) && actActivityDO.getVolunteerMax() <= count){
			if(isVolunteer.equals(1) && actActivityDO.getVolunteerMax() <= count && !actActivityDO.getVolunteerMax().equals(-1)){
			return R.fail("志愿者报名人数已满");
			}

			if(isVolunteer.equals(0) && actActivityDO.getParticipantMax() <= count){
			if(isVolunteer.equals(0) && actActivityDO.getParticipantMax() <= count && !actActivityDO.getParticipantMax().equals(-1)){
			return R.fail("居民报名人数已满");
			}
			}

			@@ -253,14 +253,14 @@
			//查询网格员头像,姓名
			Map<String,Object> gridMember = eventMapper.getUserBaseInfo(eventDO.getGridMemberId());
			if (!CollectionUtils.isEmpty(gridMember)) {
			eventDetailsVO.setGridMemberName(gridMember.get("name") == null ? "" : gridMember.get("name").toString());
			eventDetailsVO.setGridMemberName(gridMember.get("nick_name") == null ? "" : gridMember.get("nick_name").toString());
			eventDetailsVO.setGridMemberImageUrl(gridMember.get("image_url") == null ? "" : gridMember.get("image_url").toString());
			}
			if(Objects.equals(eventDO.getGridMemberId(),eventDO.getCreateBy())){
			eventDetailsVO.setCreator(eventDetailsVO.getGridMemberName());
			}else{
			Map<String,Object> createUser = eventMapper.getUserBaseInfo(eventDO.getCreateBy());
			eventDetailsVO.setCreator(createUser.get("name") == null ? "" : createUser.get("name").toString());
			eventDetailsVO.setCreator(createUser.get("nick_name") == null ? "" : createUser.get("nick_name").toString());
			}

			//当事件为特殊人群上报时，需要查询事件与人口关联关系

	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史