From 9e9f0e2d9f6fcce7dcea88b181b3c7e6069e8a1b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:55 +0800
Subject: [PATCH] fix(hrm): 请假跨月按天分摊扣款，加班工资按薪酬结构倍率计算
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 6d98f1a..4aa831d 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
@@ -39,19 +39,22 @@
}
/**
- * 鏌ヨ鍛樺伐鍦ㄦ寚瀹氭椂闂磋寖鍥村唴宸插鎵归�氳繃鐨勮鍋囪褰�
+ * 鏌ヨ鍛樺伐涓庢寚瀹氭椂闂磋寖鍥存湁浜ら泦鐨勫凡瀹℃壒閫氳繃鐨勮鍋囪褰�
+ *
+ * 娉ㄦ剰锛氭寜銆屼氦闆嗐�嶈�屼笉鏄�屽畬鍏ㄥ寘鍚�嶆煡璇€�傝法鏈堣鍋囷紙濡� 10-28 ~ 11-03锛変袱绔兘涓嶆弧瓒冲畬鍏ㄥ寘鍚紝
+ * 浼氳鏁存潯婕忔帀锛涙槸鍚︽寜澶╁垎鎽婄敱璋冪敤鏂瑰鐞嗐��
*
* @param userId 鍛樺伐ID锛堢郴缁熺敤鎴稩D锛�
- * @param startTime 寮�濮嬫椂闂�
- * @param endTime 缁撴潫鏃堕棿
+ * @param startTime 鑼冨洿寮�濮嬫椂闂�
+ * @param endTime 鑼冨洿缁撴潫鏃堕棿
* @return 璇峰亣璁板綍鍒楄〃
*/
default List<HrmLeaveApplicationDO> selectApprovedListByUserIdAndTimeRange(Long userId, LocalDateTime startTime, LocalDateTime endTime) {
return selectList(new LambdaQueryWrapperX<HrmLeaveApplicationDO>()
.eq(HrmLeaveApplicationDO::getUserId, userId)
.eq(HrmLeaveApplicationDO::getStatus, HrmAuditStatusEnum.APPROVE.getStatus())
- .ge(HrmLeaveApplicationDO::getStartTime, startTime)
- .le(HrmLeaveApplicationDO::getEndTime, endTime));
+ .le(HrmLeaveApplicationDO::getStartTime, endTime)
+ .ge(HrmLeaveApplicationDO::getEndTime, startTime));
}
}
--
Gitblit v1.9.3