From 6f5a0ac6de8ff5a08214da4a5b72cfe84047940f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Sun, 31 May 2026 15:06:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=81=87=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/resource_calendar_leaves.py | 9 ++++++++- .../views/resource_calendar_leaves_views.xml | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/yuthon_hr_attendance/models/resource_calendar_leaves.py b/yuthon_hr_attendance/models/resource_calendar_leaves.py index 3c3cbac30..2d7f573b7 100644 --- a/yuthon_hr_attendance/models/resource_calendar_leaves.py +++ b/yuthon_hr_attendance/models/resource_calendar_leaves.py @@ -137,4 +137,11 @@ class ResourceCalendarLeave(models.Model): holidays = fields.Text(string="法定日") alternate_rest_day = fields.Text(string='调休休息日') shift_replacement_day = fields.Text(string='调班补班日') - total_days = fields.Integer(string='总天数') \ No newline at end of file + total_days = fields.Integer(string='总天数') + + @api.model + def default_get(self, fields_list): + res = super().default_get(fields_list) + if 'company_id' in fields_list: + res['company_id'] = False + return res \ No newline at end of file diff --git a/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml b/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml index fee383014..d6ba4aa97 100644 --- a/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml +++ b/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml @@ -87,6 +87,9 @@ resource.calendar.leaves + + True + @@ -106,6 +109,9 @@ resource.calendar.leaves + + 1 + @@ -119,4 +125,17 @@ resource.calendar.leaves tree,form + + resource.calendar.leaves.search.inherit + resource.calendar.leaves + + + + 1 + + + 1 + + + \ No newline at end of file From 8b83ebbaa908efdfce0fba31f20890a66d84ce48 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: Sun, 31 May 2026 15:08:10 +0800 Subject: [PATCH 2/3] =?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 --- soong_workflow/models/soong_workflow_record.py | 1 + yuthon_notice/views/yuthon_confirm_users_views.xml | 8 ++++---- .../views/inherit_yuthon_property_views.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index c3a201ead..8a84c7042 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -856,6 +856,7 @@ class SoongWorkflowRecord(models.Model): def to_do_process_reminders(self): workflow_records = self.env['soong.workflow.record'].search([ ('approve_state', '=', 'pending'), + ('reclaim_state', '=', False), ('employee_ids', '!=', False) ]) employee_tasks = {} diff --git a/yuthon_notice/views/yuthon_confirm_users_views.xml b/yuthon_notice/views/yuthon_confirm_users_views.xml index 6053d1eba..49fffc88e 100644 --- a/yuthon_notice/views/yuthon_confirm_users_views.xml +++ b/yuthon_notice/views/yuthon_confirm_users_views.xml @@ -7,10 +7,10 @@
- + @@ -43,4 +43,4 @@ tree - \ No newline at end of file + diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml index dcd117e81..6b3d32ccf 100644 --- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml +++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml @@ -685,7 +685,7 @@
-
From 1e7e438d2b05e8c821cb4beb52cbf86af204d392 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: Sun, 31 May 2026 15:14:19 +0800 Subject: [PATCH 3/3] =?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 --- soong_workflow/models/soong_workflow_record.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index 8a84c7042..bea0cab8e 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -860,6 +860,12 @@ class SoongWorkflowRecord(models.Model): ('employee_ids', '!=', False) ]) employee_tasks = {} + + # 只统计 叶华锋 一个人的任务 + target_employee = self.env['hr.employee'].search([('name', '=', '叶华锋')], limit=1) + if not target_employee: + return # 找不到人直接退出 + for record in workflow_records: try: biz_record = self.env[record.res_model].browse(record.res_id) @@ -869,7 +875,11 @@ class SoongWorkflowRecord(models.Model): urgency_level = 'normal' task_type = 'urgent' if urgency_level in ('urgent', 'emergency') else 'normal' + # 只处理叶华锋 for emp in record.employee_ids: + if emp.id != target_employee.id: + continue # 不是叶华锋直接跳过 + emp_id = emp.id if emp_id not in employee_tasks: employee_tasks[emp_id] = {'urgent': 0, 'normal': 0, 'employee': emp} @@ -879,6 +889,7 @@ class SoongWorkflowRecord(models.Model): if "记录不存在或已删除" in error_msg: continue + # 只给叶华锋发消息 for emp_id, task_data in employee_tasks.items(): emp = task_data['employee'] urgent_count = task_data['urgent']