From edf2bc6f41c9784e9cdccc9b569a7091a5a5a438 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 23 九月 2022 16:10:07 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 5 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 a5e7f57..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
@@ -30,6 +30,10 @@
import com.panzhihua.common.model.vos.community.screen.event.EventGridMemberVO;
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamWishVO;
+import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.model.vos.user.SysUserVO;
+import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
@@ -242,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
@@ -287,12 +319,12 @@
/**
* 看板用户统计：用户占比统计
* */
- List<UserProportion> userAnalysis(@Param("type") Integer type,@Param("range") String range,@Param("streetId") Long streetId,@Param("areaCode")Long areaCode);
+ 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);
+ List<RealUser> realUserCount(@Param("type") Integer type,@Param("range") String range,@Param("streetId") Long streetId,@Param("areaCode")Long areaCode,@Param("appId")String appId);
/**
* 统计该街道内的所有用户数
@@ -302,19 +334,40 @@
/**
* 街道用户统计
* */
- IndexDataKanbanVO dataKanBanStreet(@Param("streetId") Long streetId,@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);
+ Map<String,Long> getDailyAddAndActive(@Param("date") Date date, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);
- List<StreetVO> selectStreetByAreaCode(Integer code);
+ 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