From bde0a39623f35d6e23aafbbc81920d095f8b1e5f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 23 七月 2022 10:07:41 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 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 edb7bb8..70bbd87 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
@@ -5,13 +5,10 @@
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.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;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -197,9 +194,10 @@
*
* @param userId
* 用户id
+ * @param status
* @return 活动列表
*/
- R listActivity(Long userId);
+ R listActivity(Long userId, Integer status,Integer type);
/**
* 查询志愿者参与的所有已经完成的活动
@@ -281,4 +279,52 @@
* @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);
}
--
Gitblit v1.7.1