From 2eea3290641657d2ee13edd90d27f8b2ec01c209 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期六, 08 五月 2021 18:23:48 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 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 44bedd6..c01f97b 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
@@ -8,6 +8,8 @@
 import com.panzhihua.common.model.vos.community.SignactivityVO;
 import com.panzhihua.service_community.model.dos.ComActActivityDO;
 
+import java.util.List;
+
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
  * @description: 社区活动
@@ -71,5 +73,40 @@
      * @return 报名 取消报名 结果
      */
     R signActivity(SignactivityVO signactivityVO);
+    /**
+     * 用户参加的所有社区活动
+     * @param userId 用户id
+     * @return 活动列表
+     */
+    R listActivity(Long userId);
+
+    /**
+     * 查询志愿者参与的所有已经完成的活动
+     * @param phone 用户手机号
+     * @return 所有活动集合
+     */
+    List<ComActActivityVO> listActivityByPhone(String phone);
+    /**
+     * 定时任务查询所有要取消的社区活动
+     * @return  社区活动集合
+     */
+    R timedTaskActActivity();
+    /**
+     * 定时任务刷新社区活动的各个状态 除取消外
+     * @return 更新结果
+     */
+    R timedTaskActActivityAll();
+    /**
+     * 社区后台分页查询社区活动
+     * @param comActActivityVO 查询参数
+     * @return 返回结果
+     */
+    R pageActivityCommunityBack(ComActActivityVO comActActivityVO);
+    /**
+     * 首页图表数据汇总
+     * @param communityId 社区id
+     * @return 图表数据 IndexDataVO
+     */
+    R indexDataCommunityBackstageEchart(Long communityId);
 
 }

--
Gitblit v1.7.1