From 93154ddc2046e23078bb7c5a3d7169b2327acbf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Tue, 1 Sep 2026 15:56:57 +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 | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 0e6344348..0f3a28458 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -232,11 +232,11 @@ class HrLeave(models.Model): if holiday.request_hour_from and holiday.request_hour_to: start_hour = float(holiday.request_hour_from) end_hour = float(holiday.request_hour_to) - if start_hour == 9 and end_hour == 12: - holiday.number_of_hours = 4 - else: - hour = end_hour - start_hour - holiday.number_of_hours = hour + # if start_hour == 9 and end_hour == 12: # 谁知道客户那边怎么弄的 有这个需要 这个时候又要改回来 + # holiday.number_of_hours = 4 + # else: + hour = end_hour - start_hour + holiday.number_of_hours = hour else: holiday.number_of_hours = 0 @@ -265,14 +265,14 @@ class HrLeave(models.Model): if self.request_hour_from and self.request_hour_to: start_hour = float(self.request_hour_from) end_hour = float(self.request_hour_to) - if start_hour == 9 and end_hour == 12: - self.leave_hours = 4 - else: - leave_hours = end_hour - start_hour - # 跨中午（12:00-13:00 午休），减去1小时 - if start_hour < 13 and end_hour > 12: - leave_hours -= 1 - self.leave_hours = leave_hours + # if start_hour == 9 and end_hour == 12: + # self.leave_hours = 4 + # else: + leave_hours = end_hour - start_hour + # 跨中午（12:00-13:00 午休），减去1小时 + if start_hour < 13 and end_hour > 12: + leave_hours -= 1 + self.leave_hours = leave_hours else: self.leave_hours = 0