From 72b52f89ee9509fc1e60943af3579a5105155b2c Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 3 Mar 2025 16:27:07 +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_holiday/models/inherit_hr_leave.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py
index 8b41e2683..0062274f2 100644
--- a/yuthon_holiday/models/inherit_hr_leave.py
+++ b/yuthon_holiday/models/inherit_hr_leave.py
@@ -4,6 +4,7 @@ from email.policy import default
 
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
+import re
 
 
 class HrLeave(models.Model):
@@ -172,10 +173,11 @@ class HolidaysRequestBatch(models.Model):
             for leave in self.leave_ids:
                 if leave.number_of_days_display:
                     number_day += leave.number_of_days_display
-            for leave in self.hour_leave_ids:
-                if leave.number_of_hours_display:
-                    number_hours += leave.number_of_hours_text
-            self.name = f"{employee_name}的休假：{number_day + number_hours}天"
+            for hour_leave in self.hour_leave_ids:
+                if hour_leave.number_of_hours_text:
+                    hours_str = re.search(r'\d+', hour_leave.number_of_hours_text).group()
+                    number_hours += float(hours_str)
+            self.name = f"{employee_name}的休假：{number_day + round(number_hours / 24, 1)}天"
         else:
             self.name = f'{employee_name}的休假'