From 705cceddf89cf6cf75f68d50d0e69cea3b1d27fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Wed, 11 Dec 2024 14:17:49 +0800 Subject: [PATCH] pengyuthon wechat --- yuthon_duty_plan/models/yuthon_duty_plan.py | 15 ++++++++------- yuthon_hr_employee/models/yuthon_hr_employee.py | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/yuthon_duty_plan/models/yuthon_duty_plan.py b/yuthon_duty_plan/models/yuthon_duty_plan.py index 2cddfc7da..122e0e3dd 100644 --- a/yuthon_duty_plan/models/yuthon_duty_plan.py +++ b/yuthon_duty_plan/models/yuthon_duty_plan.py @@ -40,24 +40,25 @@ class YuthonDutyPlan(models.Model): } } - def create_planning_slot(self,employee,role,role_template,current_date): + def create_planning_slot(self, employee, role, role_template, current_date): start_hour = int(role_template.start_time) end_hour = int(role_template.end_time) current_datetime = datetime.combine(current_date, time(0, 0, 0)) - start_time = current_datetime.replace(hour=start_hour)+ timedelta(hours=16)- timedelta(days=1) + start_time = current_datetime.replace(hour=start_hour) + timedelta(hours=16, minutes=30) - timedelta(days=1) if role_template.end_time < role_template.start_time: - end_time = current_datetime.replace(hour=end_hour)+ timedelta(days=1, hours=16)- timedelta(days=1) + end_time = current_datetime.replace(hour=end_hour) + timedelta(days=1, minutes=30, hours=16) - timedelta(days=1) else: - end_time = current_datetime.replace(hour=end_hour)+ timedelta(hours=16)- timedelta(days=1) + end_time = current_datetime.replace(hour=end_hour) + timedelta(hours=16, minutes=30) - timedelta(days=1) self.env['planning.slot'].create({ 'resource_id': employee.resource_id.id, - 'template_id':role_template.id, - 'role_id':role.id, + 'template_id': role_template.id, + 'role_id': role.id, 'start_datetime': start_time, 'end_datetime': end_time, - 'allocated_hours':8, + 'allocated_hours': 8, }) + class DutyPlanLine(models.Model): _name = 'duty.plan.line' _description = '值班计划明细行' diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py index 276ea1fc5..11437b014 100644 --- a/yuthon_hr_employee/models/yuthon_hr_employee.py +++ b/yuthon_hr_employee/models/yuthon_hr_employee.py @@ -286,8 +286,8 @@ class YuthonHrEmployee(models.Model): @api.depends('name') def _compute_pinyin(self): for employee in self: - employee.pinyin_name = ''.join(lazy_pinyin(employee.name)) - employee.pinyin_min = ''.join(lazy_pinyin(employee.name, style=STYLE_FIRST_LETTER)) + employee.pinyin_name = ''.join(lazy_pinyin(employee.name)) if employee.name else '' + employee.pinyin_min = ''.join(lazy_pinyin(employee.name, style=STYLE_FIRST_LETTER)) if employee.name else '' @api.model def _name_search(self, name, domain=None, operator='ilike', limit=None, order=None):