!6869 添加功能

Merge pull request !6869 from 李鹏宇/dev_zhou
2025-12-05 07:31:01 +00:00
parent 70c1dd7700 2e9faea5c5
commit d4e124507a
1 changed files with 2 additions and 0 deletions
@@ -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()