From ce00d25d50bd79c2d2e9cf1157b0164517a51390 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 11 五月 2022 14:17:40 +0800
Subject: [PATCH] 花城E+ 代码修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 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 ba6e2b3..1162695 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
@@ -8,8 +8,6 @@
 import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.*;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -69,9 +67,9 @@
     IndexDataKanbanVO selectIndexDataKanban(@Param("areaCode") String areaCode);
 
 
-    List<DataKanbanDTO> selectCommunityUserOrder(@Param("areaCode")String areaCode);
+    IPage<DataKanbanDTO> selectCommunityUserOrder(Page page, @Param("areaCode") String areaCode);
 
-    List<DataKanbanDTO> selectCommunityUserOrderMonth(@Param("areaCode")String areaCode);
+    IPage<DataKanbanDTO> selectCommunityUserOrderMonth(Page page, @Param("areaCode") String areaCode);
 
 
     DataKanbanDTO selectCommunityActiveUserOrder(Date date1);
@@ -258,4 +256,18 @@
      * @return
      */
     ComActAcidMemberVO selectAcidMemberByPhone(@Param("phone") String phone);
+
+    /**
+     * 根据社区名称查询区县社区联动关系
+     * @param relationName
+     * @return
+     */
+    List<ComAreaTownCommunityVO> selectAreaTownCommunity(@Param("relationName") String relationName);
+
+    /**
+     * 根据街道id查询区域名称
+     * @param streetId
+     * @return
+     */
+    String selectAreaCodeByStreetId(Long streetId);
 }

--
Gitblit v1.7.1