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/service/ComActActivityService.java |   53 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
index 39f0d40..f14d052 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
@@ -6,12 +6,11 @@
 import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
 import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
 import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
+import com.panzhihua.common.model.vos.community.*;
 import com.panzhihua.service_community.model.dos.ComActActivityDO;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -95,22 +94,58 @@
     R listActivitySigns(ActivitySignVO activitySignVO);
 
     /**
+     * description  getSignLists  查询活动报名名单
+     * @param    activitySignVO  查询参数
+     * @return    R   查询结果
+     * @author txb
+     * @date 2021/8/24 14:03
+     */
+    R getSignLists(ActivitySignVO activitySignVO);
+
+    /**
      * description  listActivityRegists  分页查询活动评价
      * @param    comActActEvaluateVO  活动评价vo
      * @return    R   分页查询结果
      * @author txb
      * @date 2021/8/24 14:03
      */
-    R pageActivityRegists(ComActActEvaluateVO comActActEvaluateVO);
+    R pageActivityEvaluates(ComActActEvaluateVO comActActEvaluateVO);
 
     /**
-     * description  getEvaluateListsByIds  批量查询活动评价
-     * @param    ids  ids
+     * description  getEvaluateLists  查询活动评价
+     * @param    comActActEvaluateVO  查询参数
      * @return    R   查询结果
      * @author txb
      * @date 2021/8/24 14:03
      */
-    R getEvaluateListsByIds(List<Long> ids);
+    R getEvaluateLists(ComActActEvaluateVO comActActEvaluateVO);
+
+    /**
+     * description  pageActivityRegists  分页查询活动签到
+     * @param    comActActRegistVO  活动签到vo
+     * @return    R   分页查询结果
+     * @author txb
+     * @date 2021/8/24 14:03
+     */
+    R pageActivityRegists(ComActActRegistVO comActActRegistVO);
+
+    /**
+     * description  getRegistLists  查询活动签到
+     * @param    comActActRegistVO  查询参数
+     * @return    R   查询结果
+     * @author txb
+     * @date 2021/8/25 9:33
+     */
+    R getRegistLists(ComActActRegistVO comActActRegistVO);
+
+    /**
+     * description  activityStagistics  活动数据统计
+     * @param activityId 活动id
+     * @return    R   统计结果
+     * @author txb
+     * @date 2021/8/25 13:33
+     */
+    R activityStatistics(Long activityId);
 
     /**
      * 分页展示我的所有活动 时间倒序排列

--
Gitblit v1.7.1