From 9f6a1be2575b9a20d8d1ab2dcdcb815eff1508c1 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Wed, 18 Jun 2025 16:31:28 +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_hr_attendance/controllers/applet_attendance.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 107b32912..a000387b6 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -298,19 +298,16 @@ class AppletAttendance(Controller): }) return records - def get_holiday_data(self, start_date_str=None, end_date_str=None): + def get_holiday_data(self, start_date=None, end_date=None): """ 获取指定日期范围内的假期和调休数据 参数: - start_date_str: 开始日期字符串，格式为'YYYY-MM-DD' - end_date_str: 结束日期字符串，格式为'YYYY-MM-DD' + start_date: 开始日期，date类型 + end_date: 结束日期，date类型 返回: 包含假期和调休信息的字典 """ - # 将字符串转换为date对象 - start_date = datetime.strptime(start_date_str, '%Y-%m-%d').date() if start_date_str else None - end_date = datetime.strptime(end_date_str, '%Y-%m-%d').date() if end_date_str else None # 从start_date中提取年份 current_year = start_date.year if start_date else datetime.now().year domain = [("calendar_id", "=", "行政考勤工作日")]