From 5fb93eaa61d42d7ebb7048057d45e285efd7f0dc Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 29 九月 2022 11:05:04 +0800
Subject: [PATCH] Merge branch '20220927' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 107 insertions(+), 0 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 f3c22ce..6e7df5a 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,7 +5,10 @@
 import java.util.Map;
 
 import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
 import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
+import com.panzhihua.common.model.vos.user.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -243,6 +246,34 @@
     int countFmsMember(@Param("phone") String phone, @Param("communityId") Long userCommunityId);
 
     /**
+     * 查询街道信息
+     * @param streetId
+     * @return
+     */
+    ComStreetVO selectStreetById(@Param("streetId") Long streetId);
+
+    /**
+     * 查询是否是社会组织成员
+     * @param userId
+     * @return
+     */
+    int countSocialOrgMember(@Param("userId") Long userId);
+
+    /**
+     * 查询是否社会组织联系人
+     * @param phone
+     * @return
+     */
+    int countOrgNum(@Param("phone") String phone);
+
+    /**
+     * 查询是否人大代表
+     * @param phone
+     * @param userCommunityId
+     * @return
+     */
+    int selectCountDpc(@Param("phone") String phone, @Param("userCommunityId") Long userCommunityId);
+    /**
      * 查看是否网格员
      * @param phone
      * @param userCommunityId
@@ -258,9 +289,85 @@
     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);
+
+    /**
+     * 看板用户统计：用户占比统计
+     * */
+    List<UserProportion> userAnalysis(@Param("type") Integer type,@Param("range") String range,@Param("streetId") Long streetId,@Param("areaCode")Long areaCode,@Param("appId")String appId);
+
+    /**
+     * 统计区域实名用户数
+     * */
+    List<RealUser> realUserCount(@Param("type") Integer type,@Param("range") String range,@Param("streetId") Long streetId,@Param("areaCode")Long areaCode,@Param("appId")String appId);
+
+    /**
+     * 统计该街道内的所有用户数
+     * */
+    Integer streetUserCount(@Param("id") Long id,@Param("areaCode")Long areaCode);
+
+    /**
+     * 街道用户统计
+     * */
+    IndexDataKanbanVO dataKanBanStreet(@Param("streetId") Long streetId,@Param("areaCode") Long areaCode,@Param("range") String range);
+
+    /**
+     * 获取当天的新增和日活
+     * */
+    Map<String,Long> getDailyAddAndActive(@Param("date") Date date, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);
+
+
+    List<StreetVOS> selectStreetByAreaCode(Integer code);
+
+    List<StreetVO> selectStreetsByAreaCode(Integer code);
+
+    ComActAcidCheckRecordVO selectComActAcidCheckRecordById(Long id);
+
+    ComActAcidRecordVO selectComActAcidRecord(Long id);
+
+    ComActAcidMemberVO selectComActAcidMember(Long id);
+
+    /**
+     * 获取本月的
+     * */
+    Integer getMonthUsers(@Param("streetId") Long streetId,@Param("areaCode") Long areaCode,@Param("range") String range,@Param("appId")String appId);
+
+    /**
+     * 获取街道下属村/社区
+     * */
+    List<CommunityVO> selectCommunityByStreetId(@Param("id") Long streetId,@Param("type") Integer type);
+
+    /**
+     * 获取账户id
+     * */
+    List<Integer> selectIdsByAccount(@Param("array") String[] streetList);
+
+    List<CommunityVO> selectCommunityByStreetName(String name);
+
+    StreetVOS selectStreetByName(String name);
 }

--
Gitblit v1.7.1