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/service/impl/UserServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index d653e66..f7d30a5 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -17,7 +17,6 @@
package org.springblade.modules.system.service.impl;
-import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +48,8 @@
import org.springblade.modules.system.service.IUserDeptService;
import org.springblade.modules.system.service.IUserOauthService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserDistrictStatisVO;
+import org.springblade.modules.system.vo.UserRegisterStatisVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.vo.UsersVo;
import org.springblade.modules.system.wrapper.UserWrapper;
@@ -486,5 +487,44 @@
return baseMapper.selectUser();
}
+ /**
+ * 统计用户注册数据
+ * @return
+ */
+ @Override
+ public List<UserRegisterStatisVO> getUserRegisterStatisticsData() {
+ return baseMapper.getUserRegisterStatisticsData();
+ }
+
+
+ @Override
+ public List<UserRegisterStatisVO> getUserTypeCount() {
+ return baseMapper.getUserTypeCount();
+ }
+
+ @Override
+ public List<UserDistrictStatisVO> getUserDistrictTypeCount() {
+ return baseMapper.getUserDistrictTypeCount();
+ }
+
+ /**
+ * 查询用户数据,未删除的,未审核的
+ * @return
+ */
+ @Override
+ public List<User> getNotAuditAllUserList() {
+ return baseMapper.getNotAuditAllUserList();
+ }
+
+ /**
+ * 查询账号相同的用户数量
+ *
+ * @param account
+ * @return
+ */
+ @Override
+ public Integer selectCount(String account) {
+ return baseMapper.selectCountAccount(account);
+ }
}
--
Gitblit v1.9.3