From c161f8538c248a6bd01054b8e5b79a1b2d5dd476 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 26 八月 2021 13:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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 b1cb57b..028017e 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
@@ -372,6 +372,18 @@
}
/**
+ * description getSignLists 查询活动报名名单
+ * @param activitySignVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("activity/sign/getList")
+ public R getSignLists(@RequestBody ActivitySignVO activitySignVO){
+ return comActActivityService.getSignLists(activitySignVO);
+ }
+
+ /**
* description listActivityRegists 分页查询活动评价
* @param comActActEvaluateVO 活动评价vo
* @return R 分页查询结果
@@ -381,6 +393,18 @@
@PostMapping("activity/evaluate/page")
public R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
return comActActivityService.pageActivityEvaluates(comActActEvaluateVO);
+ }
+
+ /**
+ * description getEvaluateLists 查询活动评价
+ * @param comActActEvaluateVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("activity/evaluate/getList")
+ public R getEvaluateLists(@RequestBody ComActActEvaluateVO comActActEvaluateVO){
+ return comActActivityService.getEvaluateLists(comActActEvaluateVO);
}
/**
@@ -396,15 +420,27 @@
}
/**
- * description getEvaluateListsByIds 批量查询活动评价
- * @param ids ids
+ * description getRegistLists 查询活动签到
+ * @param comActActRegistVO 查询参数
* @return R 查询结果
* @author txb
- * @date 2021/8/24 14:03
+ * @date 2021/8/25 9:33
*/
- @PostMapping("/activity/evaluate/getList")
- public R getEvaluateListsByIds(@RequestBody List<Long> ids){
- return comActActivityService.getEvaluateListsByIds(ids);
+ @PostMapping("activity/regist/getList")
+ public R getRegistLists(@RequestBody ComActActRegistVO comActActRegistVO){
+ return comActActivityService.getRegistLists(comActActRegistVO);
+ }
+
+ /**
+ * description activityStagistics 活动数据统计
+ * @param activityId 活动id
+ * @return R 统计结果
+ * @author txb
+ * @date 2021/8/25 13:33
+ */
+ @GetMapping("activity/statistics")
+ public R activityStatistics(@RequestParam("activityId") Long activityId){
+ return comActActivityService.activityStatistics(activityId);
}
/**
--
Gitblit v1.7.1