From 165e73d176191ae75b57c70e049c0cfd552bbdfa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 21:27:37 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index ea42eb8..5dc4774 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -13,6 +13,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.applet.query.DataReportQuery;
+import com.ruoyi.system.applet.vo.TaskFinishListVO;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
@@ -662,7 +664,7 @@
PageInfo<SysUserVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- List<SysUserVO> list = userMapper.pageList(query);
+ List<SysUserVO> list = userMapper.pageList(query,pageInfo);
if(CollectionUtils.isEmpty(list)){
return pageInfo;
}
@@ -709,13 +711,6 @@
}
}
- pageInfo.setTotal(list.size());
- if (org.springframework.util.StringUtils.hasLength(query.getDeptName())){
- List<SysUserVO> collect = list.stream().filter(sysUserVO -> sysUserVO.getDeptName().contains(query.getDeptName())).collect(Collectors.toList());
- pageInfo.setTotal(collect.size());
- // 手动分页
- list = collect.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList());
- }
pageInfo.setRecords(list);
return pageInfo;
}
@@ -751,6 +746,24 @@
}
@Override
+ public List<SysUser> selectUserByDeptId(String id) {
+ return userMapper.selectUserByDeptId(id);
+ }
+
+ @Override
+ public PageInfo<TaskFinishListVO> pageListReport(DataReportQuery query) {
+ PageInfo<TaskFinishListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TaskFinishListVO> list = userMapper.pageListReport(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public Integer selectUserCount(List<String> projectId, Integer deptType) {
+ return userMapper.selectUserCount(projectId,deptType);
+ }
+
+ @Override
public SysUser selectByPhone(String phonenumber) {
return userMapper.selectByPhone(phonenumber);
}
--
Gitblit v1.7.1