From 37d57abd8bc8aa69a2518f693a2c971de8a08859 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Sep 2023 19:26:43 +0800
Subject: [PATCH] 任务查询报错修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 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..a83d9ba 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,15 @@
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.UserVO;
import org.springblade.modules.system.vo.UsersVo;
import java.util.List;
+import java.util.Map;
/**
* Mapper 接口
@@ -53,6 +57,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);
/**
* 获取用户
@@ -67,10 +81,9 @@
/**
* 获取导出用户数据
*
- * @param queryWrapper
* @return
*/
- List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
+ List<UserExcel> exportUser(@Param("user")User user);
/**
* 根据用户编号查询用户信息
@@ -84,5 +97,36 @@
* @param page 分页
*/
List<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user);
+ List<Map<String, Object>> selectUser();
+
+ /**
+ * 统计用户注册数据
+ * @return
+ */
+ List<UserRegisterStatisVO> getUserRegisterStatisticsData();
+
+
+ List<UserRegisterStatisVO> getUserTypeCount();
+ List<UserRegisterStatisVO> getUserTypeCountXq(String xid);
+ List<UserVO> getUserTypeList(String xid, String index);
+
+ List<UserDistrictStatisVO> getUserDistrictTypeCount();
+
+ /**
+ * 查询用户数据,未删除的,未审核的
+ * @return
+ */
+ List<User> getNotAuditAllUserList();
+
+
+ /**
+ * 查询账号相同的用户数量
+ * @param account
+ * @return
+ */
+ Integer selectCountAccount(@Param("account") String account);
+ void updateAcc(String stype,String account);
+ boolean firstLogin(String id);
+ void delete(String account);
}
--
Gitblit v1.9.3