From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期四, 05 八月 2021 15:12:39 +0800 Subject: [PATCH] Merge branch 'test' into 'master' --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 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 44bedd6..ecbc0ef 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,12 +1,16 @@ 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; import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.SignactivityVO; import com.panzhihua.service_community.model.dos.ComActActivityDO; + +import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -54,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 分页参数 @@ -71,5 +81,49 @@ * @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); + + R getScreenActActivityList(ScreenActActivityListDTO actActivityListDTO); + + R getActActivityPeopleList(ScreenActActivityPeopleListDTO activityPeopleListDTO); + + /** + * 定时任务检测即将开始的社区活动,并始用订阅消息通知用户 + */ + R timedTaskActivityNotice(); } -- Gitblit v1.7.1