From 1f615d5c6ac7b116c0bb3f075331197f284b998c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 17 六月 2022 09:21:45 +0800
Subject: [PATCH] Merge branch 'huacheng_shuangzheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 8 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..94eb01c 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
@@ -5,9 +5,8 @@
import java.util.Map;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.*;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;
@@ -65,17 +64,17 @@
IPage<SysUserNoticeVO> pageNotice(Page page, @Param("pageDTO") PageDTO pageDTO);
- IndexDataKanbanVO selectIndexDataKanban();
+ IndexDataKanbanVO selectIndexDataKanban(@Param("areaCode") String areaCode);
- List<DataKanbanDTO> selectCommunityUserOrder();
+ IPage<DataKanbanDTO> selectCommunityUserOrder(Page page, @Param("areaCode") String areaCode);
- List<DataKanbanDTO> selectCommunityUserOrderMonth();
+ IPage<DataKanbanDTO> selectCommunityUserOrderMonth(Page page, @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 +195,7 @@
* 查询西区所有街道列表以及统计人数
* @return 西区所有街道列表以及统计人数
*/
- List<IndexUserStreetVo> getUserStreetList();
+ List<IndexUserStreetVo> getUserStreetList(@Param("areaCode") String areaCode);
/**
* 查询街道下社区列表以及统计人数
@@ -209,7 +208,7 @@
* 查询街道下社区注册人数统计数据导出
* @return 社区注册人数统计数据导出
*/
- List<IndexUserStreetExcelExportVo> getUserCommunityExcelExport();
+ List<IndexUserStreetExcelExportVo> getUserCommunityExcelExport(String areaCode);
/**
* 查看是否是社区物业人员
@@ -234,4 +233,48 @@
*/
int countSocialOrg(Long userId);
+
+ /**
+ * 查看是否是微团队成员
+ * @param phone
+ * @param userCommunityId
+ * @return
+ */
+ int countFmsMember(@Param("phone") String phone, @Param("communityId") Long userCommunityId);
+
+ /**
+ * 查看是否网格员
+ * @param phone
+ * @param userCommunityId
+ * @return
+ */
+ int countEasyPhotoMember(@Param("phone") String phone,@Param("communityId") Long userCommunityId);
+
+ /**
+ * 查询防疫工作人员信息
+ * @param phone
+ * @return
+ */
+ ComActAcidMemberVO selectAcidMemberByPhone(@Param("phone") String phone);
+
+ /**
+ * 查询单位管理员
+ * @param phone
+ * @return
+ */
+ Integer selectOrgAdmin(@Param("phone") String phone);
+
+ /**
+ * 根据社区名称查询区县社区联动关系
+ * @param relationName
+ * @return
+ */
+ List<ComAreaTownCommunityVO> selectAreaTownCommunity(@Param("relationName") String relationName);
+
+ /**
+ * 根据街道id查询区域名称
+ * @param streetId
+ * @return
+ */
+ String selectAreaCodeByStreetId(Long streetId);
}
--
Gitblit v1.7.1