From 093fc57beccecbf8d5d51d45edb3ae484e8f8ffd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 06 十一月 2026 16:32:52 +0800
Subject: [PATCH] fix(hrm/transfer): 调岗申请按所选员工创建并补齐校验提示
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java
index 19ab24b..d7ce1e4 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java
@@ -1,12 +1,16 @@
package cn.iocoder.yudao.module.hrm.dal.mysql.employee;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.HrmEmployeePageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDate;
+import java.util.Collection;
import java.util.List;
/**
@@ -46,12 +50,41 @@
}
default PageResult<HrmEmployeeDO> selectPage(HrmEmployeePageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<HrmEmployeeDO>()
+ LambdaQueryWrapperX<HrmEmployeeDO> wrapper = new LambdaQueryWrapperX<HrmEmployeeDO>()
.likeIfPresent(HrmEmployeeDO::getEmployeeNo, reqVO.getEmployeeNo())
.likeIfPresent(HrmEmployeeDO::getName, reqVO.getName())
.eqIfPresent(HrmEmployeeDO::getDeptId, reqVO.getDeptId())
- .eqIfPresent(HrmEmployeeDO::getEmployeeStatus, reqVO.getEmployeeStatus())
- .orderByDesc(HrmEmployeeDO::getId));
+ .eqIfPresent(HrmEmployeeDO::getEmployeeStatus, reqVO.getEmployeeStatus());
+ appendKeyword(wrapper, reqVO.getKeyword());
+ wrapper.orderByDesc(HrmEmployeeDO::getId);
+ return selectPage(reqVO, wrapper);
+ }
+
+ /**
+ * 鎸夐儴闂ㄩ泦鍚堬紙鍚瓙閮ㄩ棬锛夊垎椤垫煡璇㈠憳宸�
+ */
+ default PageResult<HrmEmployeeDO> selectPageByDeptIds(HrmEmployeePageReqVO reqVO, Collection<Long> deptIds) {
+ LambdaQueryWrapperX<HrmEmployeeDO> wrapper = new LambdaQueryWrapperX<HrmEmployeeDO>()
+ .likeIfPresent(HrmEmployeeDO::getEmployeeNo, reqVO.getEmployeeNo())
+ .likeIfPresent(HrmEmployeeDO::getName, reqVO.getName())
+ .inIfPresent(HrmEmployeeDO::getDeptId, deptIds)
+ .eqIfPresent(HrmEmployeeDO::getEmployeeStatus, reqVO.getEmployeeStatus());
+ appendKeyword(wrapper, reqVO.getKeyword());
+ wrapper.orderByDesc(HrmEmployeeDO::getId);
+ return selectPage(reqVO, wrapper);
+ }
+
+ /**
+ * 鍏抽敭璇嶆ā绯婂尮閰嶅憳宸ョ紪鍙� / 濮撳悕 / 鎵嬫満鍙�
+ */
+ private void appendKeyword(LambdaQueryWrapperX<HrmEmployeeDO> wrapper, String keyword) {
+ if (StrUtil.isBlank(keyword)) {
+ return;
+ }
+ String kw = keyword.trim();
+ wrapper.and(w -> w.like(HrmEmployeeDO::getEmployeeNo, kw)
+ .or().like(HrmEmployeeDO::getName, kw)
+ .or().like(HrmEmployeeDO::getPhone, kw));
}
default List<HrmEmployeeDO> selectListByStatus(Integer employeeStatus) {
@@ -64,4 +97,14 @@
return selectCount(HrmEmployeeDO::getSalaryStructureId, salaryStructureId);
}
+ /**
+ * 鎸夌郴缁熺敤鎴风紪鍙锋洿鏂板憳宸ョ鑱岀姸鎬佷笌绂昏亴鏃ユ湡
+ */
+ default int updateEmployeeStatusByUserId(Long userId, Integer employeeStatus, LocalDate leaveDate) {
+ return update(null, new LambdaUpdateWrapper<HrmEmployeeDO>()
+ .eq(HrmEmployeeDO::getUserId, userId)
+ .set(HrmEmployeeDO::getEmployeeStatus, employeeStatus)
+ .set(HrmEmployeeDO::getLeaveDate, leaveDate));
+ }
+
}
--
Gitblit v1.9.3