From edfa63ce36732f7355bf23dc04eea6d6db1c60bd Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 06 五月 2022 16:49:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 13 +++++++++----
1 files changed, 9 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..f3c22ce 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,11 @@
* @return
*/
ComActAcidMemberVO selectAcidMemberByPhone(@Param("phone") String phone);
+
+ /**
+ * 根据社区名称查询区县社区联动关系
+ * @param relationName
+ * @return
+ */
+ List<ComAreaTownCommunityVO> selectAreaTownCommunity(@Param("relationName") String relationName);
}
--
Gitblit v1.7.1