From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSocialSecurityMapper.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSocialSecurityMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSocialSecurityMapper.java
index cd785f8..effb246 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSocialSecurityMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSocialSecurityMapper.java
@@ -7,34 +7,44 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmEmployeeSocialSecurityDO;
import org.apache.ibatis.annotations.Mapper;
-import java.time.LocalDate;
+import java.util.Collection;
import java.util.List;
/**
- * 鍛樺伐绀句繚鍏Н閲戞。妗� Mapper
+ * 閮ㄩ棬绀句繚鍏Н閲戞。妗� Mapper
*
* @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface HrmEmployeeSocialSecurityMapper extends BaseMapperX<HrmEmployeeSocialSecurityDO> {
- default HrmEmployeeSocialSecurityDO selectLatestByUserId(Long userId) {
+ default HrmEmployeeSocialSecurityDO selectLatestByDeptId(Long deptId) {
return selectOne(new LambdaQueryWrapperX<HrmEmployeeSocialSecurityDO>()
- .eq(HrmEmployeeSocialSecurityDO::getUserId, userId)
+ .eq(HrmEmployeeSocialSecurityDO::getDeptId, deptId)
.eq(HrmEmployeeSocialSecurityDO::getStatus, 0)
.orderByDesc(HrmEmployeeSocialSecurityDO::getEffectiveDate)
.last("LIMIT 1"));
}
- default List<HrmEmployeeSocialSecurityDO> selectListByUserId(Long userId) {
+ /**
+ * 鎵归噺鏌ヨ澶氫釜閮ㄩ棬鍚勮嚜鏈�鏂扮敓鏁堢殑妗ｆ锛岀敤浜庤柂閰牳绠楁椂閬垮厤閫愬憳宸ユ煡璇�
+ */
+ default List<HrmEmployeeSocialSecurityDO> selectListByDeptIds(Collection<Long> deptIds) {
return selectList(new LambdaQueryWrapperX<HrmEmployeeSocialSecurityDO>()
- .eq(HrmEmployeeSocialSecurityDO::getUserId, userId)
+ .inIfPresent(HrmEmployeeSocialSecurityDO::getDeptId, deptIds)
+ .eq(HrmEmployeeSocialSecurityDO::getStatus, 0)
+ .orderByDesc(HrmEmployeeSocialSecurityDO::getEffectiveDate));
+ }
+
+ default List<HrmEmployeeSocialSecurityDO> selectListByDeptId(Long deptId) {
+ return selectList(new LambdaQueryWrapperX<HrmEmployeeSocialSecurityDO>()
+ .eq(HrmEmployeeSocialSecurityDO::getDeptId, deptId)
.orderByDesc(HrmEmployeeSocialSecurityDO::getEffectiveDate));
}
default PageResult<HrmEmployeeSocialSecurityDO> selectPage(HrmEmployeeSocialSecurityPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<HrmEmployeeSocialSecurityDO>()
- .eqIfPresent(HrmEmployeeSocialSecurityDO::getUserId, reqVO.getUserId())
+ .eqIfPresent(HrmEmployeeSocialSecurityDO::getDeptId, reqVO.getDeptId())
.eqIfPresent(HrmEmployeeSocialSecurityDO::getStatus, reqVO.getStatus())
.eqIfPresent(HrmEmployeeSocialSecurityDO::getEffectiveDate, reqVO.getEffectiveDate())
.orderByDesc(HrmEmployeeSocialSecurityDO::getId));
--
Gitblit v1.9.3