From da8cca4d320908b672f439369e65e9e6a95374e3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 07 三月 2022 09:46:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 731ee9b..502b163 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -65,17 +65,17 @@
IPage<SysUserNoticeVO> pageNotice(Page page, @Param("pageDTO") PageDTO pageDTO);
- IndexDataKanbanVO selectIndexDataKanban();
+ IndexDataKanbanVO selectIndexDataKanban(@Param("areaCode") String areaCode);
- List<DataKanbanDTO> selectCommunityUserOrder();
+ List<DataKanbanDTO> selectCommunityUserOrder(@Param("areaCode")String areaCode);
- List<DataKanbanDTO> selectCommunityUserOrderMonth();
+ List<DataKanbanDTO> selectCommunityUserOrderMonth(@Param("areaCode")String areaCode);
DataKanbanDTO selectCommunityActiveUserOrder(Date date1);
- DataKanbanDTO selectCommunityAddUserOrder(Date date1);
+ DataKanbanDTO selectCommunityAddUserOrder(@Param("areaCode")String areaCode,@Param("date1")Date date1);
IndexDataVO indexDataCommunityBackstage(Long communityId);
@@ -196,7 +196,7 @@
* 查询西区所有街道列表以及统计人数
* @return 西区所有街道列表以及统计人数
*/
- List<IndexUserStreetVo> getUserStreetList();
+ List<IndexUserStreetVo> getUserStreetList(@Param("areaCode") String areaCode);
/**
* 查询街道下社区列表以及统计人数
@@ -209,7 +209,7 @@
* 查询街道下社区注册人数统计数据导出
* @return 社区注册人数统计数据导出
*/
- List<IndexUserStreetExcelExportVo> getUserCommunityExcelExport();
+ List<IndexUserStreetExcelExportVo> getUserCommunityExcelExport(String areaCode);
/**
* 查看是否是社区物业人员
@@ -234,4 +234,12 @@
*/
int countSocialOrg(Long userId);
+
+ /**
+ * 查看是否是微团队成员
+ * @param phone
+ * @param userCommunityId
+ * @return
+ */
+ int countFmsMember(@Param("phone") String phone, @Param("communityId") Long userCommunityId);
}
--
Gitblit v1.7.1