From cc595b0aa24773735417accd0158da6ac98a6db0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 六月 2022 14:47:56 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 4 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 f3f3b1c..d41af90 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;
@@ -68,9 +67,9 @@
IndexDataKanbanVO selectIndexDataKanban(@Param("areaCode") String areaCode);
- List<DataKanbanDTO> selectCommunityUserOrder(@Param("areaCode")String areaCode);
+ IPage<DataKanbanDTO> selectCommunityUserOrder(Page page, @Param("areaCode") String areaCode);
- List<DataKanbanDTO> selectCommunityUserOrderMonth(@Param("areaCode")String areaCode);
+ IPage<DataKanbanDTO> selectCommunityUserOrderMonth(Page page, @Param("areaCode") String areaCode);
DataKanbanDTO selectCommunityActiveUserOrder(Date date1);
@@ -234,4 +233,55 @@
*/
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);
+
+ /**
+ * 查询报道单位id
+ * @param phone
+ * @return
+ */
+ Long selectCheckUnitId(@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