From cf60a875646dbaaa7932f93286d8e708ed79c6dc Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 18 七月 2022 17:39:33 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 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..f147273 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;
@@ -268,7 +270,6 @@
*/
Long selectCheckUnitId(@Param("phone") String phone);
-
/**
* 根据社区名称查询区县社区联动关系
* @param relationName
@@ -286,27 +287,45 @@
/**
* 看板用户统计：用户占比统计
* */
- 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,@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);
+ List<StreetVO> selectStreetByAreaCode(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);
+
+ /**
+ * 获取街道下属村/社区
+ * */
+ List<CommunityVO> selectCommunityByStreetId(@Param("id") Integer streetId,@Param("type") Integer type);
+
}
--
Gitblit v1.7.1