From ebf94cb3ed4f487ca1fcd7069db0ca141553a4db Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 20 六月 2025 17:52:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
index 0d486e3..a106f94 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
@@ -2,7 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.documents4j.api.IFileConsumer;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.applet.query.LeaveListUserQuery;
+import com.ruoyi.system.applet.vo.LeaveUserListVO;
+import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.TDeptMapper;
import com.ruoyi.system.mapper.TLeaveMapper;
import com.ruoyi.system.mapper.TProjectDeptMapper;
@@ -36,6 +41,8 @@
private TProjectDeptMapper projectDeptMapper;
@Autowired
private TDeptMapper deptMapper;
+ @Autowired
+ private SysUserMapper sysUserMapper;
@Override
public PageInfo<LeaveListVO> pageList(LeaveListQuery query) {
if (StringUtils.hasLength(query.getDeptName())){
@@ -72,4 +79,25 @@
pageInfo.setRecords(list);
return pageInfo;
}
+
+ @Override
+ public PageInfo<LeaveUserListVO> leaveList(LeaveListUserQuery query) {
+ List<SysUser> sysUsers = sysUserMapper.selectAllList();
+ if (StringUtils.hasLength(query.getLeavePersonName())){
+ List<Long> collect = sysUsers.stream().filter(e -> e.getNickName().contains(query.getLeavePersonName()))
+ .map(SysUser::getUserId).collect(Collectors.toList());
+ query.setUserIds(collect);
+ }
+ PageInfo<LeaveUserListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<LeaveUserListVO> list = this.baseMapper.leaveList(query,pageInfo);
+ for (LeaveUserListVO leaveUserListVO : list) {
+ SysUser sysUser = sysUsers.stream().filter(e -> (e.getUserId() + "").equals(leaveUserListVO.getLeavePerson()))
+ .findFirst().orElse(null);
+ if (sysUser!=null){
+ leaveUserListVO.setLeavePersonName(sysUser.getNickName());
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
--
Gitblit v1.7.1