From f80afdbc853857579ef24f6e679bde4be8b57e39 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 14:15:43 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 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 4c0a7d4..9afc4f8 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,8 +3,11 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
+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.*;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
@@ -196,7 +199,7 @@
* @param status
* @return 活动列表
*/
- R listActivity(Long userId, Integer status);
+ R listActivity(Long userId, Integer status,Integer type);
/**
* 查询志愿者参与的所有已经完成的活动
@@ -312,4 +315,25 @@
* @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(CommonPage commonPage);
}
--
Gitblit v1.7.1