!9005 !9004 添加功能

Merge pull request !9005 from 李鹏宇/dev
2026-02-26 06:53:14 +00:00
parent cba78d8476 0d3e7cd228
commit e368be612f
1 changed files with 4 additions and 1 deletions
@@ -670,7 +670,10 @@ class HolidaysRequestBatch(models.Model):
        for interval in month_intervals:
            interval_start = interval['start']
            interval_end = interval['end']
-            interval_hours = self._compute_duration_day(holiday_status_id, interval_start, interval_end) * 8
+            if self.is_hour:
+                interval_hours = hours
+            else:
+                interval_hours = self._compute_duration_day(holiday_status_id, interval_start, interval_end) * 8
            period_start = interval['period_start']
            first_day = fields.Date.today().replace(day=1)