From c7673b8c8f1d20c58c7265fa00c6fbf69caf994d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 04 十一月 2026 13:55:39 +0800
Subject: [PATCH] fix(shift): 修复排班与考勤的时间范围查询条件
---
src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
index 14d522c..88912db 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
@@ -71,7 +71,8 @@
//鍒ゆ柇鍒ゆ柇鍛樺伐褰撳ぉ鏄惁鏈夋帓鐝暟鎹�
List<PersonalShift> personalShifts = personalShiftMapper.selectList(Wrappers.<PersonalShift>lambdaQuery()
.eq(PersonalShift::getStaffOnJobId, staffOnJob.getId())
- .eq(PersonalShift::getWorkTime, currentDate.atStartOfDay())
+ .ge(PersonalShift::getWorkTime, currentDate.atStartOfDay())
+ .lt(PersonalShift::getWorkTime, currentDate.plusDays(1).atStartOfDay())
.isNotNull(PersonalShift::getPersonalAttendanceLocationConfigId)
.ne(PersonalShift::getPersonalAttendanceLocationConfigId, 999));
if (CollectionUtil.isEmpty(personalShifts)){
@@ -230,7 +231,8 @@
//鑾峰彇璇ュ憳宸ュ搴旂殑鎵撳崱瑙勫垯
List<PersonalShift> personalShifts = personalShiftMapper.selectList(Wrappers.<PersonalShift>lambdaQuery()
.eq(PersonalShift::getStaffOnJobId, staffOnJob.getId())
- .eq(PersonalShift::getWorkTime, currentDate.atStartOfDay())
+ .ge(PersonalShift::getWorkTime, currentDate.atStartOfDay())
+ .lt(PersonalShift::getWorkTime, currentDate.plusDays(1).atStartOfDay())
.isNotNull(PersonalShift::getPersonalAttendanceLocationConfigId)
.ne(PersonalShift::getPersonalAttendanceLocationConfigId, 999));
if (CollectionUtil.isNotEmpty(personalShifts)){
--
Gitblit v1.9.3