pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加功能

Browse Source
This commit is contained in:
zhou
2025-05-28 20:56:32 +08:00
parent ae1bb61b61
commit dee9659f52
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_holiday/models/inherit_hr_leave.py
+5 -5
View File
@@ -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