From b3494a7ad95455020800758ab75c6e7502a50da4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 05 十一月 2021 09:30:35 +0800
Subject: [PATCH] Merge branch 'zhaozhengjie1104' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 9982304..5ab057e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
@@ -277,8 +278,8 @@
});
}
comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
- Integer participantMax = comActActivityVO1.getParticipantMax();
- if (participantMax.intValue() == 0) {
+ Integer volunteerMax = comActActivityVO1.getVolunteerMax();
+ if (volunteerMax.intValue() != 0) {
comActActivityVO1.setType(1);
} else {
comActActivityVO1.setType(2);
@@ -1386,8 +1387,9 @@
* @return 活动列表
*/
@PostMapping("listactivity")
- public R listActivity(@RequestParam("userId") Long userId) {
- return comActActivityService.listActivity(userId);
+ public R listActivity(@RequestParam("userId") Long userId,
+ @RequestParam(value = "status", required = false) Integer status) {
+ return comActActivityService.listActivity(userId, status);
}
/**
@@ -2477,4 +2479,36 @@
public R listRegistRecord(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
return comActActivityService.listRegistRecord(id, userId);
}
+
+ /**
+ * 获取活动类型（目前只有志愿者活动需要获取）
+ * @param communityId
+ * @param type
+ * @return
+ */
+ @GetMapping("activity/type/list")
+ public R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type) {
+ return comActActivityService.listActivityType(communityId, type);
+ }
+
+ /**
+ * 添加活动类型
+ * @param comActActivityTypeVO
+ * @return
+ */
+ @PostMapping("activity/type/add")
+ public R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO) {
+ return comActActivityService.addActivityType(comActActivityTypeVO);
+ }
+
+ /**
+ * 我的评价
+ * @param userId
+ * @param activityId 活动id
+ * @return
+ */
+ @GetMapping("activity/my-evaluate")
+ public R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId) {
+ return comActActEvaluateService.listMyActivityEvaluate(userId, activityId);
+ }
}
--
Gitblit v1.7.1