From 1d372d5e4916eaecf9b773e52e0d887d4fd0e47a Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 05 十一月 2026 15:02:27 +0800
Subject: [PATCH] fix(hrm): 社保扣款在员工未加社保时误扣、两方案扣款相同
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
index da80141..08c4a90 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
@@ -6,15 +6,18 @@
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmLeaveApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmLeaveApplicationDO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
+import cn.hutool.core.collection.CollUtil;
import org.apache.ibatis.annotations.Mapper;
import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
/**
* 璇峰亣鐢宠 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface HrmLeaveApplicationMapper extends BaseMapperX<HrmLeaveApplicationDO> {
@@ -54,4 +57,24 @@
.le(HrmLeaveApplicationDO::getEndTime, endTime));
}
+ /**
+ * 鎵归噺鏌ヨ澶氫釜鍛樺伐鍦ㄦ寚瀹氭椂闂磋寖鍥村唴宸插鎵归�氳繃鐨勮鍋囪褰曪紙鐢ㄤ簬鎸夋棩鍖洪棿鐨勮�冨嫟缁熻锛�
+ *
+ * @param userIds 鍛樺伐ID闆嗗悎锛堢郴缁熺敤鎴稩D锛�
+ * @param startTime 寮�濮嬫椂闂�
+ * @param endTime 缁撴潫鏃堕棿
+ * @return 璇峰亣璁板綍鍒楄〃
+ */
+ default List<HrmLeaveApplicationDO> selectApprovedListByUserIdsAndTimeRange(Collection<Long> userIds,
+ LocalDateTime startTime, LocalDateTime endTime) {
+ if (CollUtil.isEmpty(userIds)) {
+ return new ArrayList<>();
+ }
+ return selectList(new LambdaQueryWrapperX<HrmLeaveApplicationDO>()
+ .in(HrmLeaveApplicationDO::getUserId, userIds)
+ .eq(HrmLeaveApplicationDO::getStatus, HrmAuditStatusEnum.APPROVE.getStatus())
+ .le(HrmLeaveApplicationDO::getStartTime, endTime)
+ .ge(HrmLeaveApplicationDO::getEndTime, startTime));
+ }
+
}
--
Gitblit v1.9.3