From dee9659f52eb9a2fa77ecd497b9b5273da74c218 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Wed, 28 May 2025 20:56:32 +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, 5 insertions(+), 5 deletions(-) diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 50d828b24..6b3bdcc12 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -179,7 +179,7 @@ class HrLeave(models.Model): holidays_list.extend(leaves.alternate_rest_day.split(',')) #调休日 target_day = holiday.request_date_from target_day_str = f"{target_day.month}月{target_day.day}日" - is_weekend = self.request_date_from.weekday() in [5, 6] + is_weekend = holiday.request_date_from.weekday() in [5, 6] # 判断是否为假期 if target_day_str in holidays_list: holiday.number_of_hours = 0 @@ -220,11 +220,11 @@ class HrLeave(models.Model): hour = float(end_hour) - float(start_hour) holiday.number_of_hours = hour - days = (self.request_date_to - self.request_date_from).days + 1 - current_date = self.request_date_from - while current_date <= self.request_date_to: + days = (holiday.request_date_to - holiday.request_date_from).days + 1 + current_date = holiday.request_date_from + while current_date <= holiday.request_date_to: current_date_str = current_date.strftime('%m月%d日') - current_date_str = self.remove_leading_zero(current_date_str) + current_date_str = holiday.remove_leading_zero(current_date_str) is_weekend = current_date.weekday() in [5, 6] if current_date_str in holidays_list: days -= 1