From eee03bbfea8b15d1a56ab63bd09a35c6c861c4cb Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 09 十一月 2026 13:01:08 +0800
Subject: [PATCH] feat(mes): 不合格品处置联动入库与生产订单
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java | 90 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 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 6265746..5ed407e 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,13 +1,20 @@
package cn.iocoder.yudao.module.hrm.dal.mysql.employee;
+import cn.hutool.core.collection.CollUtil;
+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.Collections;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 鍛樺伐淇℃伅 Mapper
@@ -19,6 +26,14 @@
default HrmEmployeeDO selectByPhone(String phone) {
return selectOne(HrmEmployeeDO::getPhone, phone);
+ }
+
+ default HrmEmployeeDO selectByName(String name) {
+ return selectOne(HrmEmployeeDO::getName, name);
+ }
+
+ default List<HrmEmployeeDO> selectListByName(String name) {
+ return selectList(HrmEmployeeDO::getName, name);
}
default HrmEmployeeDO selectByEmployeeNo(String employeeNo) {
@@ -33,17 +48,76 @@
return selectList(HrmEmployeeDO::getDeptId, deptId);
}
+ /**
+ * 鎸夐儴闂ㄩ泦鍚堬紙鍚笅绾ч儴闂級鏌ヨ鍛樺伐
+ */
+ default List<HrmEmployeeDO> selectListByDeptIds(Collection<Long> deptIds) {
+ return selectList(new LambdaQueryWrapperX<HrmEmployeeDO>()
+ .in(HrmEmployeeDO::getDeptId, deptIds)
+ .orderByAsc(HrmEmployeeDO::getName));
+ }
+
default List<HrmEmployeeDO> selectByEmployeeStatus(Integer employeeStatus) {
return selectList(HrmEmployeeDO::getEmployeeStatus, employeeStatus);
}
+ /**
+ * 鎸夊矖浣嶇紪鍙烽泦鍚堟煡璇㈠湪鑱�/璇曠敤鍛樺伐
+ * <p>
+ * 鍛樺伐琛ㄧ殑 post_ids 瀛樼殑鏄� JSON 鏁扮粍锛堝 [17, 18]锛夛紝浣跨敤 JSON_CONTAINS 绮剧‘鍖归厤宀椾綅
+ *
+ * @param postIds 宀椾綅缂栧彿闆嗗悎
+ * @return 鍛樺伐鍒楄〃
+ */
+ default List<HrmEmployeeDO> selectListByPostIds(Collection<Long> postIds) {
+ if (CollUtil.isEmpty(postIds)) {
+ return Collections.emptyList();
+ }
+ String postCondition = postIds.stream()
+ .map(postId -> "JSON_CONTAINS(post_ids, '[" + postId + "]')")
+ .collect(Collectors.joining(" OR "));
+ return selectList(new LambdaQueryWrapperX<HrmEmployeeDO>()
+ .in(HrmEmployeeDO::getEmployeeStatus, List.of(1, 2))
+ .apply("(" + postCondition + ")")
+ .orderByAsc(HrmEmployeeDO::getName));
+ }
+
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) {
@@ -56,4 +130,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