From e05a23efb37cb1aa5f6a8187ab1f45bc8d3dc426 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 七月 2021 18:21:51 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index 466c60c..b1da84d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -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);
--
Gitblit v1.7.1