From 67ef643ae8b227c00a6f9f67ecf1b22211feb65d Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 22 九月 2022 13:33:24 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 67 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 d19405d..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,9 @@
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;
@@ -28,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;
@@ -240,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
@@ -268,7 +302,6 @@
*/
Long selectCheckUnitId(@Param("phone") String phone);
-
/**
* 根据社区名称查询区县社区联动关系
* @param relationName
@@ -286,27 +319,55 @@
/**
* 看板用户统计：用户占比统计
* */
- List<UserProportion> userAnalysis(@Param("type") Integer type,@Param("range") String range,@Param("streetId") 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);
+ 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);
+ Integer streetUserCount(@Param("id") Long id,@Param("areaCode")Long areaCode);
/**
* 街道用户统计
* */
- IndexDataKanbanVO dataKanBanStreet(Long streetId);
+ 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);
+ 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