From c168f544ecd041760e7d0fba66c48e06b9ab67dc Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 16:51:21 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java
index c456893..0070f3c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java
@@ -37,7 +37,7 @@
* @param date
* @return
*/
- BigScreenActivityLine selectActivityCountMonth(@Param("communityId")Long communityId, @Param("date")String date);
+ BigScreenActivityLine selectActivityCountMonth(@Param("communityId")Long communityId, @Param("date")String date,@Param("year")String year);
/**
* 查询党员积分前3
@@ -59,4 +59,31 @@
* @return
*/
List<BigScreenServiceUser> bigScreenServiceUser(@Param("communityId")Long communityId);
+
+ /**
+ * 通过userID确认是否是党员
+ * @param userId
+ * @return
+ */
+ Integer checkIsPbMember(@Param("userId") Long userId);
+
+ /**
+ * 通过userID确认是否是志愿者
+ * @param userId
+ * @return
+ */
+ Integer checkIsVolunteer(@Param("userId") Long userId);
+
+ /**
+ * 统计在职干部特长
+ * @return
+ */
+ List<ComPbMemberTypeVO> statisticsPbMemberType();
+
+ /**
+ * 单位类型
+ * @return
+ */
+ List<ComPbMemberTypeVO> selectUnitByNatureName();
+
}
--
Gitblit v1.7.1