From f556a77f91e573590f5b575ca65ce4f421386955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Wed, 3 Jun 2026 15:38:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=8C=E6=9F=A5=E9=98=85=E6=83=85=E5=86=B5=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_employee/__manifest__.py            |  1 +
 .../models/yuthon_hr_employee.py              | 58 +++++++++++++++++++
 .../inherit_hr_employee_fix_calendar.xml      | 17 ++++++
 yuthon_notice/models/yuthon_confirm_users.py  |  2 +
 .../views/yuthon_confirm_users_views.xml      |  2 +-
 5 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 yuthon_hr_employee/views/inherit_hr_employee_fix_calendar.xml

diff --git a/yuthon_hr_employee/__manifest__.py b/yuthon_hr_employee/__manifest__.py
index fff2de219..fd3ff90fe 100644
--- a/yuthon_hr_employee/__manifest__.py
+++ b/yuthon_hr_employee/__manifest__.py
@@ -30,6 +30,7 @@
         'views/inherit_hr_applicant_views.xml',
         'views/publish_applicant_setting_views.xml',
         'views/inherit_res_groups_views.xml',
+        'views/inherit_hr_employee_fix_calendar.xml',
         'views/yuthon_medical_rule_views.xml',
         'views/yuthon_medical_manage_views.xml',
         'views/yuthon_job_postings_views.xml',
diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py
index c02235f39..542b7b172 100644
--- a/yuthon_hr_employee/models/yuthon_hr_employee.py
+++ b/yuthon_hr_employee/models/yuthon_hr_employee.py
@@ -823,6 +823,64 @@ class YuthonHrEmployee(models.Model):
             else:
                 num.number = ''
 
+    def action_batch_fix_resource_calendar(self):
+        """根据所属公司批量修复员工工作时间"""
+        company_calendar_map = {
+            '天河物管': '行政考勤-物管',
+            '集团本部': '行政考勤-本部',
+            '天河粮储': '行政考勤-粮储',
+        }
+        updated_count = 0
+        skipped_count = 0
+        failed_employees = []
+
+        # 预加载所有需要的 resource.calendar
+        calendar_names = list(company_calendar_map.values())
+        calendars = self.env['resource.calendar'].search([('name', 'in', calendar_names)])
+        calendar_map = {cal.name: cal for cal in calendars}
+
+        for employee in self:
+            company_name = employee.company_id.name if employee.company_id else False
+            if not company_name or company_name not in company_calendar_map:
+                skipped_count += 1
+                continue
+
+            calendar_name = company_calendar_map[company_name]
+            calendar = calendar_map.get(calendar_name)
+
+            if not calendar:
+                skipped_count += 1
+                continue
+
+            if not employee.contract_id:
+                skipped_count += 1
+                continue
+
+            try:
+                employee.contract_id.write({'resource_calendar_id': calendar.id})
+                updated_count += 1
+            except Exception as e:
+                failed_employees.append('%s(%s)' % (employee.name, employee.id))
+                continue
+
+        parts = ['成功更新 %d 条记录，跳过 %d 条。' % (updated_count, skipped_count)]
+        if failed_employees:
+            parts.append('失败 %d 条：%s' % (len(failed_employees), ', '.join(failed_employees[:5])))
+            if len(failed_employees) > 5:
+                parts.append('...等共 %d 条' % len(failed_employees))
+        message = '\n'.join(parts)
+
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': '批量修复工作时间完成',
+                'message': message,
+                'type': 'success',
+                'sticky': False,
+            }
+        }
+
     def action_hr_employee(self):
         return {
             "type": "ir.actions.act_window",
diff --git a/yuthon_hr_employee/views/inherit_hr_employee_fix_calendar.xml b/yuthon_hr_employee/views/inherit_hr_employee_fix_calendar.xml
new file mode 100644
index 000000000..518f28233
--- /dev/null
+++ b/yuthon_hr_employee/views/inherit_hr_employee_fix_calendar.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_employee_tree_fix_calendar" model="ir.ui.view">
+        <field name="name">hr.employee.tree.fix.calendar</field>
+        <field name="model">hr.employee</field>
+        <field name="inherit_id" ref="yuthon_hr_employee.view_employee_inherit_del_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="inside">
+                <header>
+                    <button name="action_batch_fix_resource_calendar" type="object"
+                            string="批量修复工作时间" display="always"
+                            groups="hr.group_hr_manager"/>
+                </header>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/yuthon_notice/models/yuthon_confirm_users.py b/yuthon_notice/models/yuthon_confirm_users.py
index aa2484076..d6ccbfbfe 100644
--- a/yuthon_notice/models/yuthon_confirm_users.py
+++ b/yuthon_notice/models/yuthon_confirm_users.py
@@ -23,6 +23,8 @@ class YuthonConfirmUsers(models.Model):
     employee_number = fields.Char(related='employee_id.number', string='序号', store=True)
 
     def withdrawn(self):
+        if self.state == 'to_sent':
+            raise UserError('该通知还未发送，无法撤回')
         if self.msg_id:
             self.sudo().env["wecom.apps"].back_message(self.msg_id, category='notice')
             self.state = 'to_sent'
diff --git a/yuthon_notice/views/yuthon_confirm_users_views.xml b/yuthon_notice/views/yuthon_confirm_users_views.xml
index 49fffc88e..9799c36f7 100644
--- a/yuthon_notice/views/yuthon_confirm_users_views.xml
+++ b/yuthon_notice/views/yuthon_confirm_users_views.xml
@@ -20,7 +20,7 @@
                 <field name="release_date"/>
                 <field name="create_time"/>
                 <field name="msg_id"/>
-                <button name="withdrawn" string="撤回" type="object" class="oe_highlight" confirm="确认要撤回吗？" column_invisible="state == 'to_sent'"/>
+                <button name="withdrawn" string="撤回" type="object" class="oe_highlight" confirm="确认要撤回吗？"/>
             </tree>
         </field>
     </record>