From 283eeb1825e35162f8e0d5ab3e837d36ad8a1d29 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, 21 Apr 2026 17:41:05 +0800 Subject: [PATCH 1/2] =?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_employee_approval/models/yuthon_onboard_approval.py | 1 + 1 file changed, 1 insertion(+) diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index 08c8fe03f..1ad9fcdde 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -260,6 +260,7 @@ class YuthonOnboardApproval(models.Model): 'date_end': self.duration_employment_end, 'start_date': self.probation_start_date or self.duration_employment, 'end_date': self.probation_end_date or self.duration_employment_end, + 'resource_calendar_id': resource_calendar_id.id, 'is_probation': True, }) From 917b57b44b72cf47cec14baae8f387d3b7f52da4 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, 21 Apr 2026 17:57:15 +0800 Subject: [PATCH 2/2] =?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/models/message_reminder_tasks.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yuthon_hr_attendance/models/message_reminder_tasks.py b/yuthon_hr_attendance/models/message_reminder_tasks.py index 0c1675f2b..c3e8715b2 100644 --- a/yuthon_hr_attendance/models/message_reminder_tasks.py +++ b/yuthon_hr_attendance/models/message_reminder_tasks.py @@ -58,6 +58,11 @@ class MessageReminderTasks(models.Model): final_employees = condition1_employees.filtered(lambda emp: emp not in condition2_employee_ids) task_vals_list = [] is_workday = self._process_shift_days(current_date) + template = self.env['planning.slot.template'].search( + [('role_id.name', '=', '集团行政')], + limit=1 + ) + sch_check_in_time, sch_check_out_time = self.normal_clock_in_time(template, current_date) if is_workday: for employee in final_employees: emp_name = employee.name @@ -66,7 +71,7 @@ class MessageReminderTasks(models.Model): is_lactating = employee.id in breastfeeding_employee_ids if is_lactating: # 哺乳人员 - reminder_times = self.get_reminder_lactating_personnel(employee, current_date) + reminder_times = self.get_reminder_lactating_personnel(employee, current_date, sch_check_in_time, sch_check_out_time) reminder_types = ['work', 'offWork'] shift_name = '行政班次（哺乳）' else: