From f0e91343445b1e568d1dfe705252d3e1201a18a7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 七月 2022 18:02:36 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 48c4941..b80b8b1 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
@@ -342,7 +342,9 @@
Map<String,Long> getDailyAddAndActive(@Param("date") Date date,@Param("id") Long streetId,@Param("areaCode") Long areaCode);
- List<StreetVO> selectStreetByAreaCode(Integer code);
+ List<StreetVOS> selectStreetByAreaCode(Integer code);
+
+ List<StreetVO> selectStreetsByAreaCode(Integer code);
ComActAcidCheckRecordVO selectComActAcidCheckRecordById(Long id);
@@ -355,5 +357,17 @@
* */
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);
+ /**
+ * 获取账户id
+ * */
+ List<Integer> selectIdsByAccount(@Param("array") String[] streetList);
+
+ List<CommunityVO> selectCommunityByStreetName(String name);
+
+ StreetVOS selectStreetByName(String name);
}
--
Gitblit v1.7.1