From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 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 cb0db70..02f9caf 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
@@ -3,6 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityTop;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceData;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceUser;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.service_community.model.dos.ComPbMemberDO;
import org.apache.ibatis.annotations.Mapper;
@@ -22,8 +26,51 @@
public interface ComPbMemberDAO extends BaseMapper<ComPbMemberDO> {
/**
* 根据用户手机号查询党员信息
- * @param phone
+ * @param idCard
* @return
*/
- ComPbMemberVO selectById(String phone);
+ ComPbMemberVO selectById(String idCard);
+
+ /**
+ *根据社区id日期查询活动数
+ * @param communityId
+ * @param date
+ * @return
+ */
+ BigScreenActivityLine selectActivityCountMonth(@Param("communityId")Long communityId, @Param("date")String date,@Param("year")String year);
+
+ /**
+ * 查询党员积分前3
+ * @param communityId
+ * @return
+ */
+ IPage<BigScreenActivityTop> selectActivityTop(Page page,@Param("communityId") Long communityId);
+
+ /**
+ * 服务数据查询
+ * @param communityId
+ * @return
+ */
+ BigScreenServiceData bigScreenServiceData(@Param("communityId")Long communityId);
+
+ /**
+ * 服务居民
+ * @param communityId
+ * @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);
}
--
Gitblit v1.7.1