From 2f07df24db44a6ae121ee68f855c6a63b372d8ce Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 29 八月 2023 17:47:27 +0800
Subject: [PATCH] 修改核销报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 172 insertions(+), 4 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 90a0739..a73ce86 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
@@ -3,12 +3,14 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
+import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
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.dtos.property.CommonPage;
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.SignactivityVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
/**
@@ -93,6 +95,86 @@
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 pageActivityEvaluates(ComActActEvaluateVO comActActEvaluateVO);
+
+ /**
+ * description getEvaluateLists 查询活动评价
+ * @param comActActEvaluateVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ 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 getRegistLists 查询活动未签到
+ * @param comActActRegistVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/25 9:33
+ */
+ R getNoRegistLists(ComActActRegistVO comActActRegistVO);
+
+ /**
+ * description activityStagistics 活动数据统计
+ * @param activityId 活动id
+ * @return R 统计结果
+ * @author txb
+ * @date 2021/8/25 13:33
+ */
+ R activityStatistics(Long activityId);
+
+ /**
+ * 获取活动历史封面 getPictureList
+ * @param userId 用户id
+ * @return R 统计结果
+ * @author txb
+ * @date 2021/8/27 13:33
+ */
+ R getPictureList(Long userId);
+
+ /**
+ * 获取系统预置图库 getSysPictureList
+ * @return R 系统图库集
+ * @author txb
+ * @date 2021/8/27 13:33
+ */
+ R getSysPictureList(Integer type);
+
+ /**
* 分页展示我的所有活动 时间倒序排列
*
* @param comActActivityVO
@@ -115,9 +197,10 @@
*
* @param userId
* 用户id
+ * @param status
* @return 活动列表
*/
- R listActivity(Long userId);
+ R listActivity(Long userId, Integer status,Integer type);
/**
* 查询志愿者参与的所有已经完成的活动
@@ -169,4 +252,89 @@
*/
R timedTaskActivityNotice();
+ /**
+ * 用户签到
+ *
+ * @param comActActRegistVO 签到参数
+ * @return 签到结果
+ */
+ R activitySignIn(ComActActRegistVO comActActRegistVO);
+
+ /**
+ *用户签到记录列表
+ *
+ * @param userId 用id
+ * @return 用户签到列表
+ */
+ R listSignInActivity(Long userId);
+
+ /**
+ * 获取活动报名签到记录
+ * @param id 活动主键id
+ * @return
+ */
+ R listSignInRecord(Long id);
+
+ /**
+ * 活动签到记录
+ * @param id 活动主键
+ * @param userId 用户id
+ * @return
+ */
+ R listRegistRecord(Long id, Long userId);
+
+ /**
+ * 获取活动类型（目前只有志愿者活动需要获取）
+ * @param communityId
+ * @param type
+ * @return
+ */
+ R listActivityType(Long communityId, Integer type);
+
+ /**
+ * 添加活动类型
+ * @param comActActivityTypeVO
+ * @return
+ */
+ R addActivityType(ComActActivityTypeVO comActActivityTypeVO);
+
+ /**
+ * [方法描述] 根据社区ID查询所属城市所在区区域代码，
+ *
+ * @param communityId
+ * 社区ID
+ * @return String 区域code
+ * @author manailin
+ * @date 2022/2/17 10:09
+ */
+ String getActBelongRegionCode(Long communityId);
+
+ /**
+ * 党员活动统计
+ * @param communityId
+ * @param year
+ * @return
+ */
+ R partyMemberCount(Long communityId,String year);
+
+ /**
+ * 党员活动个人统计
+ * @param commonPage
+ * @return
+ */
+ R partyMemberDetail(CommonPage commonPage);
+
+ /**
+ *导出党员活动
+ * @param commonPage
+ * @return
+ */
+ R exportPartyMemberDetail(CommonPage commonPage);
+
+ /**
+ * 大屏-社区活动分页
+ * @param commonPage
+ * @return
+ */
+ R pageActivityBigScreen(PageBaseDTO pageBaseDTO);
}
--
Gitblit v1.7.1