From 8cb82432832795a55d8a72c73484517d110a7b00 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 27 八月 2021 18:15:48 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into shequhuodong

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java |   62 +++++++++++++++++++++++++++---
 1 files changed, 55 insertions(+), 7 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 957c865..c309429 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
@@ -511,6 +511,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   分页查询结果
@@ -518,20 +530,56 @@
      * @date 2021/8/24 14:03
      */
     @PostMapping("activity/evaluate/page")
-    public R pageActivityRegists(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
-        return comActActivityService.pageActivityRegists(comActActEvaluateVO);
+    public R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
+        return comActActivityService.pageActivityEvaluates(comActActEvaluateVO);
     }
 
     /**
-     * description  getEvaluateListsByIds  批量查询活动评价
-     * @param    ids  ids
+     * description  getEvaluateLists  查询活动评价
+     * @param    comActActEvaluateVO  查询参数
      * @return    R   查询结果
      * @author txb
      * @date 2021/8/24 14:03
      */
-    @PostMapping("/activity/evaluate/getList")
-    public R getEvaluateListsByIds(@RequestBody List<Long> ids){
-        return comActActivityService.getEvaluateListsByIds(ids);
+    @PostMapping("activity/evaluate/getList")
+    public R getEvaluateLists(@RequestBody ComActActEvaluateVO comActActEvaluateVO){
+        return comActActivityService.getEvaluateLists(comActActEvaluateVO);
+    }
+
+    /**
+     * description  pageActivityRegists  分页查询活动签到
+     * @param    comActActRegistVO  活动签到vo
+     * @return    R   分页查询结果
+     * @author txb
+     * @date 2021/8/24 14:03
+     */
+    @PostMapping("activity/regist/page")
+    public R pageActivityRegists(@RequestBody ComActActRegistVO comActActRegistVO) {
+        return comActActivityService.pageActivityRegists(comActActRegistVO);
+    }
+
+    /**
+     * description  getRegistLists  查询活动签到
+     * @param    comActActRegistVO  查询参数
+     * @return    R   查询结果
+     * @author txb
+     * @date 2021/8/25 9:33
+     */
+    @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