From 594431cfe842cdbba79ae2e05f49daa1373c934e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 12 七月 2022 16:49:24 +0800
Subject: [PATCH] update

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |   19 ++++++++++++++-----
 1 files changed, 14 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 d80fc05..a5e7f57 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;
@@ -285,27 +287,34 @@
     /**
      * 看板用户统计:用户占比统计
      * */
-    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);
 
     /**
      * 统计区域实名用户数
      * */
-    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);
 
     /**
      * 统计该街道内的所有用户数
      * */
-    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);
 
     /**
      * 获取当天的新增和日活
      * */
-    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);
 
 
+    List<StreetVO> selectStreetByAreaCode(Integer code);
+
+    ComActAcidCheckRecordVO selectComActAcidCheckRecordById(Long id);
+
+    ComActAcidRecordVO selectComActAcidRecord(Long id);
+
+    ComActAcidMemberVO selectComActAcidMember(Long id);
 }

--
Gitblit v1.7.1