From 2e9faea5c553d4acd8bb2817b7c4aa68599ff851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Fri, 5 Dec 2025 15:30:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_attendance/models/overtime_approval.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py index 617f446af..54618c563 100644 --- a/yuthon_hr_attendance/models/overtime_approval.py +++ b/yuthon_hr_attendance/models/overtime_approval.py @@ -122,7 +122,9 @@ class OvertimeApprovals(models.Model): rel_end_time = rec.attendance_id.shift_id.end_datetime + timedelta(hours=8) else: rel_end_time = rec.start_time.replace(hour=18, minute=0, second=0, microsecond=0) + end_time = rec.end_time + timedelta(hours=8) + rel_end_time = max(rel_end_time, rec.start_time + timedelta(hours=8)) # 只有工作日18点开始算加班 if rec.type_overtime == 'work': total_seconds = (end_time - rel_end_time).total_seconds()