java/zhihuishenqu.git

			@@ -265,6 +265,21 @@
			return R.fail("只有志愿者才能报名");
			}

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

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

			ComActActSignDO comActActSignDO=new ComActActSignDO();
			comActActSignDO.setActivityId(activityId);
			comActActSignDO.setUserId(userId);

			@@ -578,7 +578,7 @@
			WHERE
			event_category = 1
			AND event_process_status = 2
			AND create_at BETWEEN DATE_FORMAT( DATE_ADD( curdate(), INTERVAL - DAY ( curdate())+ 1 DAY ), '%Y-%m-%d %H:%i:%s' )
			AND process_date BETWEEN DATE_FORMAT( DATE_ADD( curdate(), INTERVAL - DAY ( curdate())+ 1 DAY ), '%Y-%m-%d %H:%i:%s' )
			AND NOW()
			<if test="gridId!=null">
			AND grid_id = #{gridId}
			@@ -592,7 +592,7 @@
			WHERE
			event_category = 2
			AND event_status = 2
			AND create_at BETWEEN DATE_FORMAT( CURDATE(), '%Y-%m-%d %H:%i:%s' )
			AND process_date BETWEEN DATE_FORMAT( CURDATE(), '%Y-%m-%d %H:%i:%s' )
			AND NOW()
			<if test="gridId!=null">
			AND grid_id = #{gridId}
			@@ -612,7 +612,7 @@
			AND event_type = 6
			AND event_status = 2
			AND event_process_status = 2
			AND create_at BETWEEN DATE_FORMAT( CURDATE(), '%Y-%m-%d %H:%i:%s' )
			AND process_date BETWEEN DATE_FORMAT( CURDATE(), '%Y-%m-%d %H:%i:%s' )
			AND NOW()
			<if test="gridId!=null">
			AND grid_id = #{gridId}
			@@ -662,7 +662,7 @@
			WHERE
			event_category = 1
			AND event_process_status = 2
			AND create_at BETWEEN DATE_FORMAT( CURDATE(), '%Y-%m-%d %H:%i:%s' )
			AND process_date BETWEEN DATE_FORMAT( CURDATE(), '%Y-%m-%d %H:%i:%s' )
			AND NOW()
			<if test="gridId!=null">
			AND grid_id = #{gridId}

	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史