From 81e41215c522743d2d21b8011049347a523ef6ad Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 04 六月 2025 09:29:17 +0800
Subject: [PATCH] 管理后台代码

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   74 +++++++++++++++++++++++++++++++++---
 1 files changed, 67 insertions(+), 7 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 933f0fa..3b86e89 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
@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.basic.PageInfo;
@@ -7,6 +8,7 @@
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
@@ -14,11 +16,10 @@
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.domain.SysUserPost;
 import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.mapper.SysPostMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.mapper.SysUserPostMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.mapper.*;
+import com.ruoyi.system.model.TDept;
+import com.ruoyi.system.model.TLeave;
+import com.ruoyi.system.model.TProjectDept;
 import com.ruoyi.system.query.SysUserQuery;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
@@ -31,6 +32,8 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.validation.Validator;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -645,14 +648,71 @@
         return userMapper.selectAllList();
     }
 
+    @Autowired
+    private TProjectDeptMapper projectDeptMapper;
+    @Autowired
+    private TDeptMapper deptMapper;
+    @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+    @Autowired
+    private  TLeaveMapper leaveMapper;
+
     @Override
     public PageInfo<SysUserVO> pageList(SysUserQuery query) {
         PageInfo<SysUserVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
-        List<SysUserVO> list = userMapper.pageList(query,pageInfo);
+
+
+        List<SysUserVO> list = userMapper.pageList(query);
         if(CollectionUtils.isEmpty(list)){
             return pageInfo;
         }
-        List<Long> userIds = list.stream().map(SysUserVO::getUserId).collect(Collectors.toList());
+        for (SysUserVO sysUserVO : list) {
+            TLeave tLeave = leaveMapper.selectOne(new LambdaQueryWrapper<TLeave>()
+                    .eq(TLeave::getLeavePerson, sysUserVO.getUserId())
+                    .eq(TLeave::getAuditStatus, 2)
+                    .ge(TLeave::getStartTime, DateUtils.getNowDate())
+                    .le(TLeave::getEndTime, DateUtils.getNowDate())
+                    .last("limit 1"));
+            if (tLeave!=null){
+                sysUserVO.setLeaveName("请假中");
+                LocalDateTime startTime = tLeave.getStartTime();
+                LocalDateTime endTime = tLeave.getEndTime();
+                // 转化为yyyy-MM-dd字符串格式
+                sysUserVO.setLeaveTime(startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))+"至"+endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+            }else{
+                sysUserVO.setLeaveName("正常");
+            }
+            // todo 查询请假状态
+            SysUserRole temp = sysUserRoleMapper.selectUserRole(sysUserVO.getUserId());
+            if (temp!=null){
+                SysRole sysRole = roleMapper.selectRoleById(temp.getRoleId());
+                if (sysRole!=null){
+                     sysUserVO.setRoleName(sysRole.getRoleName());
+                }
+            }
+            String deptType = sysUserVO.getDeptType();
+            if (org.springframework.util.StringUtils.hasLength(deptType)){
+                if ("1".equals(deptType)){
+                    TProjectDept tProjectDept = projectDeptMapper.selectById(sysUserVO.getDeptId());
+                    if (!tProjectDept.getParentId().equals("0")){
+                        TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
+                         sysUserVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+                    }else{
+                        sysUserVO.setDeptName(tProjectDept.getProjectName());
+                    }
+                }else{
+                    TDept tDept = deptMapper.selectById(sysUserVO.getDeptId());
+                     sysUserVO.setDeptName(tDept.getDeptName());
+                }
+            }
+        }
+        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;
     }

--
Gitblit v1.7.1