From b86302cc1bdcdd4f147657ce3f3b42bf5f8dd357 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Wed, 27 Nov 2024 20:58:00 +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

---
 .../views/hr_attendance_views.xml             | 33 +++++++++++++++++++
 yuthon_work_brand/views/attendance_menu.xml   | 17 +++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index dc16214f9..8e97c93c9 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -37,6 +37,39 @@
         <field name="res_model">hr.attendance</field>
         <field name="view_mode">tree,form</field>
     </record>
+    <record id="action_attendance_yuthon_company_form1" model="ir.actions.act_window">
+        <field name="name">天河投资</field>
+        <field name="res_model">hr.attendance</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">
+            {
+                "search_default_employee": 1
+            }
+        </field>
+        <field name="domain">[('employee_id.yuthon_company','=','thtz')]</field>
+    </record>
+    <record id="action_attendance_yuthon_company_form2" model="ir.actions.act_window">
+        <field name="name">天河粮储</field>
+        <field name="res_model">hr.attendance</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">
+            {
+                "search_default_employee": 1
+            }
+        </field>
+        <field name="domain">[('employee_id.yuthon_company', '=', 'thlc')]</field>
+    </record>
+    <record id="action_attendance_yuthon_company_form3" model="ir.actions.act_window">
+        <field name="name">天河物管</field>
+        <field name="res_model">hr.attendance</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">
+            {
+                "search_default_employee": 1
+            }
+        </field>
+        <field name="domain">[('employee_id.yuthon_company', '=', 'thwg')]</field>
+    </record>
     <record id="hr_attendance_action1" model="ir.actions.act_window">
         <field name="name">我的考勤</field>
         <field name="res_model">hr.attendance</field>
diff --git a/yuthon_work_brand/views/attendance_menu.xml b/yuthon_work_brand/views/attendance_menu.xml
index 256c2a7f2..ed4125df9 100644
--- a/yuthon_work_brand/views/attendance_menu.xml
+++ b/yuthon_work_brand/views/attendance_menu.xml
@@ -162,8 +162,23 @@
     <menuitem id="menu_hr_attendance_all_record_board"
               name="全部考勤"
               parent="hr_attendance_record_root_board"
-              action="hr_attendance.hr_attendance_action"
+                  action="hr_attendance.hr_attendance_action"
               sequence="1"/>
+    <menuitem id="menu_hr_attendance_tt_record_board"
+              name="天河投资"
+              parent="hr_attendance_record_root_board"
+              action="yuthon_hr_attendance.action_attendance_yuthon_company_form1"
+              sequence="3"/>
+    <menuitem id="menu_hr_attendance_lc_record_board"
+              name="天河粮储"
+              parent="hr_attendance_record_root_board"
+              action="yuthon_hr_attendance.action_attendance_yuthon_company_form2"
+              sequence="5"/>
+    <menuitem id="menu_hr_attendance_wg_record_board"
+              name="天河物管"
+              parent="hr_attendance_record_root_board"
+              action="yuthon_hr_attendance.action_attendance_yuthon_company_form3"
+              sequence="7"/>
     <!--  值班相关  -->
     <menuitem id="menu_hr_attendance_duty_summary_menu_board"
               name="粮库值班管理"

From c699a8844bd61626787bae277ac4e9edeab0b502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Wed, 27 Nov 2024 21:05:05 +0800
Subject: [PATCH 2/2] pengyuthon wechat

---
 yuthon_will_task/models/yuthon_will_task.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py
index 5d3ff0c9b..75af21121 100644
--- a/yuthon_will_task/models/yuthon_will_task.py
+++ b/yuthon_will_task/models/yuthon_will_task.py
@@ -5,7 +5,6 @@ from odoo.exceptions import UserError
 import logging
 
 _logger = logging.getLogger(__name__)
-now = datetime.now() + timedelta(hours=8)
 
 
 class YuthonWillTask(models.Model):
@@ -23,11 +22,12 @@ class YuthonWillTask(models.Model):
     employee_ids = fields.Many2many('hr.employee', string='人员', default=lambda self: self.env.user.employee_id)
     task_time_ids = fields.Many2many('yuthon.task.time', string='提醒')
     start_time = fields.Datetime(string='开始时间', default=fields.Date.today())
-    end_time = fields.Datetime(string='结束时间', default=lambda self: datetime.combine(now.date(), time(11, 0, 0)))
+    end_time = fields.Datetime(string='结束时间', default=lambda self: datetime.combine(datetime.now().date(), time(11, 0, 0)))
 
     def will_task_time(self):
         tasks = self.env['yuthon.will.task'].search([])
         for task in tasks:
+            now = datetime.now() + timedelta(hours=8)
             start_time = task.start_time + timedelta(hours=8)
             _logger.info("定时任务执行中")
             _logger.info("判断前now:{}---start:{}".format(now, start_time))