From d2baab8c43dca88365dac6e98a95ceee644001e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 15 七月 2021 09:47:53 +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, 36 insertions(+), 1 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 b415b8b..feab55a 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
@@ -1,6 +1,8 @@
 package com.panzhihua.service_community.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+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.ActivitySignVO;
 import com.panzhihua.common.model.vos.community.ComActActivityVO;
@@ -56,11 +58,17 @@
      */
     ComActActivityVO inforActivity(Long id, Long userId);
     /**
-     * 活动报名名单
+     * 分页活动报名名单
      * @param activitySignVO 查询参数
      * @return 报名人员集合
      */
     R listActivitySign(ActivitySignVO activitySignVO);
+    /**
+     * 活动报名名单
+     * @param activitySignVO 查询参数
+     * @return 报名人员集合
+     */
+    R listActivitySigns(ActivitySignVO activitySignVO);
     /**
      * 分页展示我的所有活动 时间倒序排列
      * @param comActActivityVO 分页参数
@@ -86,4 +94,31 @@
      * @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);
+
+    R getScreenActActivityList(ScreenActActivityListDTO actActivityListDTO);
+
+    R getActActivityPeopleList(ScreenActActivityPeopleListDTO activityPeopleListDTO);
+
 }

--
Gitblit v1.7.1