!9635 !9634 添加功能

Merge pull request !9635 from 李鹏宇/dev
2026-03-12 06:58:36 +00:00
parent cac7c1e98e 5fb49be6cb
commit ff2604d291
1 changed files with 3 additions and 4 deletions
@@ -946,8 +946,7 @@ class HolidaysRequestBatch(models.Model):
                        raise UserError(
                            _(f"天河物管休假时长必须为 2、4、6 或 8 小时才可以保存！")
                        )
-            leave_days = 0.0
-            overtime_days = 0.0
+
            total_annual_leave_days = 0.0  # 年假总天数
            total_compensatory_leave_days = 0.0  # 补休总天数
            for leave_line in record.leave_ids:
@@ -959,9 +958,9 @@ class HolidaysRequestBatch(models.Model):
            for hour_leave_line in record.hour_leave_ids:
                leave_hours = float(hour_leave_line.leave_hours or 0)
                leave_days = leave_hours / 8
-                if hour_leave_line.holiday_status_id == '年假':
+                if hour_leave_line.holiday_status_id.name  == '年假':
                    total_annual_leave_days += leave_days
-                elif hour_leave_line.holiday_status_id == '补休':
+                elif hour_leave_line.holiday_status_id.name == '补休':
                    total_compensatory_leave_days += leave_days

            if total_annual_leave_days > self.remaining_annual_leave: