From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 8187c6d..f327758 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -20,11 +20,14 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.excel.UserExcel;
+import org.springblade.modules.system.vo.UserDistrictStatisVO;
+import org.springblade.modules.system.vo.UserRegisterStatisVO;
import org.springblade.modules.system.vo.UsersVo;
import java.util.List;
+import java.util.Map;
/**
* Mapper 接口
@@ -53,6 +56,16 @@
* @return
*/
List<User> selectUserPages(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<String> deptIdList);
+ /**
+ * 自定义分页(带坐标)通讯录
+ *
+ * @param page
+ * @param user
+ * @param deptIdList
+ * @param
+ * @return
+ */
+ List<User> selectUserPagetxl(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<String> deptIdList);
/**
* 获取用户
@@ -84,5 +97,31 @@
* @param page 分页
*/
List<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user);
+ List<Map<String, Object>> selectUser();
+
+ /**
+ * 统计用户注册数据
+ * @return
+ */
+ List<UserRegisterStatisVO> getUserRegisterStatisticsData();
+
+
+ List<UserRegisterStatisVO> getUserTypeCount();
+
+ List<UserDistrictStatisVO> getUserDistrictTypeCount();
+
+ /**
+ * 查询用户数据,未删除的,未审核的
+ * @return
+ */
+ List<User> getNotAuditAllUserList();
+
+
+ /**
+ * 查询账号相同的用户数量
+ * @param account
+ * @return
+ */
+ Integer selectCountAccount(@Param("account") String account);
}
--
Gitblit v1.9.3