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()