From 30cb126dac8e6f4891f5348e4b0da33f834540af 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: Thu, 19 Dec 2024 17:25:22 +0800
Subject: [PATCH 01/13] pengyuthon wechat

---
 yuthon_property/models/yuthon_property.py     |  4 +--
 .../views/yuthon_property_views.xml           |  5 ++-
 .../models/property_split_approval.py         | 36 +++++++++----------
 .../views/property_split_approval_views.xml   |  5 ++-
 4 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index 17c222cb9..e9c2fbac7 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -59,8 +59,7 @@ class YuthonProperty(models.Model):
     description = fields.Html(string="描述")
     is_message_fee = fields.Boolean(string="管理费")
     message_standard_id = fields.Many2one('property.message.fee', string="管理费标准")
-    code = fields.Char(string="编号",
-                       default=lambda self: self.env['ir.sequence'].next_by_code('property_message_code'))
+    code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_message_code'))
     rental_unit_price = fields.Float(string="评估单价")
     address = fields.Text(string="物业地址")
     title_number = fields.Char(string="产权编号")
@@ -240,6 +239,7 @@ class YuthonProperty(models.Model):
                 'default_property_merge_approval_line_ids':property_list
         }}
 
+
 class YuthonPropertyWater(models.Model):
     _name = 'yuthon.property.water'
     _description = '水表'
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 31ee8dc50..3d2f82b37 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -65,7 +65,7 @@
                     </group>
                     <group string="属性价值" col="2">
                         <group>
-                            <field name="yuthon_company" readonly="1"/>
+                            <field name="yuthon_company"/>
                             <field name="admin_id"/>
                             <field name="purpose_id"/>
                             <field name="mgmt_type_id"/>
@@ -119,7 +119,7 @@
                                     <field name="purpose_id"/>
                                     <field name="precinct"/>
                                     <field name="admin_id"/>
-                                    <field name="yuthon_company" readonly="1"/>
+                                    <field name="yuthon_company"/>
                                     <field name="start_time"/>
                                     <field name="end_date"/>
                                 </tree>
@@ -188,7 +188,6 @@
                 <searchpanel>
                     <field name="mgmt_type_id" string="管理类型"/>
                     <field name="yuthon_company" string="所属公司"/>
-                    <field name="admin_id" string="管理员"/>
                 </searchpanel>
             </search>
         </field>
diff --git a/yuthon_property_approval/models/property_split_approval.py b/yuthon_property_approval/models/property_split_approval.py
index 1d634f660..d9cf22018 100644
--- a/yuthon_property_approval/models/property_split_approval.py
+++ b/yuthon_property_approval/models/property_split_approval.py
@@ -1,4 +1,5 @@
 from odoo import models, fields, api, exceptions, _
+from odoo.exceptions import UserError
 
 
 class PropertySplitApproval(models.Model):
@@ -6,8 +7,7 @@ class PropertySplitApproval(models.Model):
     _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
     _description = '物业拆分审批'
 
-    code = fields.Char(string="编号",
-                       default=lambda self: self.env['ir.sequence'].next_by_code('property_split_approval_code'))
+    code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_split_approval_code'))
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
     property_id = fields.Many2one('yuthon.property', string='物业名称')
@@ -23,25 +23,20 @@ class PropertySplitApproval(models.Model):
     reason = fields.Html(string="正文")
     notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
     property_split_approval_line_ids = fields.One2many('property.split.approval.line', 'property_split_approval_id', string='关联物业拆分明细行')
-    split_quantity = fields.Integer(string='拆分数量')
+    split_quantity = fields.Integer(string='拆分数量', default=2)
 
-    #自由拆分
-    @api.onchange('split_quantity')
-    def onchange_split_quantity(self):
-        self.property_split_approval_line_ids.unlink()
-        for i in range(self.split_quantity):
-            self.property_split_approval_line_ids.create({
-                            'property_split_approval_id': self.id,
-                            'split_property':self.property_id.name + '-'+str(i+1)})
-
-    # #平均拆分
-    # def put_evaluation_splitting(self):
-    #     for i in range(self.split_quantity):
-    #         self.env['property.split.approval.line'].create({
-    #             'property_split_approval_id': self.id,
-    #             'split_property': self.property_id.name + '-' + str(i + 1),
-    #             'split_building_area': self.property_id.building_area/self.split_quantity,
-    #             'split_rent_area': self.property_id.rent_area/self.split_quantity})
+    def property_split_button(self):
+        if self.split_quantity < 2:
+            raise UserError('拆分数量必须是大于2')
+        if self.id.origin and self.property_id:
+            lines_to_create = []
+            for i in range(self.split_quantity):
+                lines_to_create.append({
+                    'property_split_approval_id': self.id.origin,
+                    'split_property': f"{self.property_id.name}-{i + 1}"
+                })
+            self.property_split_approval_line_ids.unlink()
+            self.env['property.split.approval.line'].create(lines_to_create)
 
     def put_split_message(self):
         property_list = []
@@ -58,6 +53,7 @@ class PropertySplitApproval(models.Model):
         self.property_id.write({'is_done_split': True})
         self.property_id.disassembly_information_ids = property_list
 
+
 class PropertySplitApprovalLine(models.Model):
     _name = 'property.split.approval.line'
     _description = '物业拆分明细行'
diff --git a/yuthon_property_approval/views/property_split_approval_views.xml b/yuthon_property_approval/views/property_split_approval_views.xml
index ee45d488b..6efc855a8 100644
--- a/yuthon_property_approval/views/property_split_approval_views.xml
+++ b/yuthon_property_approval/views/property_split_approval_views.xml
@@ -37,6 +37,8 @@
                             <field name="units"/>
                             <field name="property_floor"/>
                             <field name="asset_type_id"/>
+                            <field name="split_quantity"/>
+                            <button name="property_split_button" type="object" string="拆分" class="btn-primary"/>
                         </group>
                         <group>
                             <field name="building_area"/>
@@ -44,9 +46,6 @@
                             <field name="remarks"/>
                         </group>
                     </group>
-                    <group>
-                        <field name="split_quantity"/>
-                    </group>
                     <notebook>
                         <page string="拆分信息">
                             <field name="property_split_approval_line_ids">

From 9536e7b0ebfbc2eb065d7b24754e9924a58e90f0 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 19 Dec 2024 19:29:30 +0800
Subject: [PATCH 02/13] =?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_user_role.py  | 2 +-
 yuthon_holiday/models/inherit_hr_leave.py | 2 +-
 yuthon_work_brand/views/hr_menus.xml      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/soong_workflow/models/soong_user_role.py b/soong_workflow/models/soong_user_role.py
index a58677230..c4b73c0c1 100644
--- a/soong_workflow/models/soong_user_role.py
+++ b/soong_workflow/models/soong_user_role.py
@@ -21,7 +21,7 @@ class YuthonUserRole(models.Model):
     personnel = fields.Text(string="在岗人员", compute='_compute_personnel')
     employee_ids = fields.One2many('hr.employee', 'user_role_id')
     number_people = fields.Integer(string="在岗人数", compute='_compute_number_people')
-    child_ids = fields.One2many('soong.user.role', 'parent_id', string='子集角色', index=True)
+    child_ids = fields.One2many('soong.user.role', 'parent_id', string='下级角色', index=True)
     yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'),
                                            ('thlc', '天河粮储'), ('thtjbb', '天河投资本部')], string="所属公司", compute='compute_company')
     pinyin_name = fields.Char(string="拼音名称", compute='_compute_pinyin', index=True, store=True)
diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py
index 018a9be37..9badd12d8 100644
--- a/yuthon_holiday/models/inherit_hr_leave.py
+++ b/yuthon_holiday/models/inherit_hr_leave.py
@@ -131,7 +131,7 @@ class HolidaysRequestBatch(models.Model):
     details = fields.Text(string="假期流程说明", compute='_compute_details')
     days = fields.Float(string='天数')
     hours = fields.Float(string='小时')
-    text = fields.Html(string='申请事由')
+    text = fields.Text(string='申请事由')
     is_day = fields.Boolean(string='按天请假')
     is_hour = fields.Boolean(string='按小时请假')
     leave_ids = fields.One2many(string='按天请假详情', comodel_name='hr.leave', inverse_name='batch_id', domain=[('leave_type_request_unit', '=', 'day')])
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 71528d000..b64ead976 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -134,8 +134,8 @@
               sequence="10"/>
     <menuitem id="hr_set_process_menu_root_board"
               name="流程"
-              parent="hr_employee_menu_root_board"
-              sequence="11"/>
+              parent="hr_menu_root_board"
+              sequence="5"/>
     <menuitem id="hr_menu_regularization_approval_root_board"
               name="转正申请表"
               parent="hr_set_process_menu_root_board"

From f88417b8ebb41e937dc9bb6e4e0b856b4d1d316b Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 19 Dec 2024 19:40:30 +0800
Subject: [PATCH 03/13] =?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_wechat/models/hr_attendance_detail.py | 156 +++++++++----------
 1 file changed, 78 insertions(+), 78 deletions(-)

diff --git a/yuthon_wechat/models/hr_attendance_detail.py b/yuthon_wechat/models/hr_attendance_detail.py
index 637eb327c..e69649a96 100644
--- a/yuthon_wechat/models/hr_attendance_detail.py
+++ b/yuthon_wechat/models/hr_attendance_detail.py
@@ -244,96 +244,95 @@ class HrAttendanceDetail(models.Model):
             if not attendance_obj:
                 res_user_obj = self.env['res.users'].search([("oauth_uid", "=", userid)], limit=1)
                 hr_employee_obj = self.env['hr.employee'].sudo().search([("user_id", "=", res_user_obj.id)], limit=1)
-            if not hr_employee_obj.default_planning_role_id:
-                checkin_type = data.get("checkin_type", "")
-                exception_type = data.get("exception_type", "")
-                attendance_obj = self.env['hr.attendance'].sudo().create({
-                    'employee_id': hr_employee_obj.id,
-                    "userid": userid,
-                    "current_data": current_data,
-                    "attendance_type": "wx_work"
-                })
-
-                 # 获取考勤日历的上班下班时间
-                min_hour_from = self.env['resource.calendar'].search([])[0].attendance_ids[0].hour_from
-                min_hour = int(min_hour_from)
-                min_minute = int(min_hour_from * 10 % min_hour_from)
-                max_hour_to = self.env['resource.calendar'].search([])[-1].attendance_ids[0].hour_to
-                max_hour = int(max_hour_to)
-                max_minute = int(max_hour_to * 10 % max_hour_to)
-                if attendance_obj.is_approval:# 已经审批修复无需再次进行更新数据
-                    return True
-                # 赋值企业微信打卡数据
-                attendance_obj.attendance_type = "wx_work"
-                will_datetime_start = checkin_time.replace(hour=min_hour, minute=min_minute)
-                will_datetime_end = checkin_time.replace(hour=max_hour, minute=max_minute)
-                if exception_type != "未打卡":
-                    if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
-                        attendance_obj.sudo().write({
-                            "sch_check_in_time": sch_checkin_time,
-                            "check_in": checkin_time,
-                            "is_late_card": checkin_time > will_datetime_start,
-                        })
-                    elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
-                        attendance_obj.sudo().write({
-                            "sch_check_out_time": sch_checkin_time,
-                            "check_out": checkin_time,
-                            "is_early_card": will_datetime_end > checkin_time,
-                        })
-                    elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
-                        attendance_obj.sudo().write({
-                            "sch_check_in_time": sch_checkin_time,
-                            "check_in": checkin_time,
-                            "is_late_card": checkin_time > will_datetime_start,
-                        })
-                    elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
-                        attendance_obj.sudo().write({
-                            "sch_check_out_time": sch_checkin_time,
-                            "check_out": checkin_time,
-                            "is_early_card": will_datetime_end > checkin_time,
-                        })
-                    elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
-                        attendance_obj.sudo().write({
-                            "sch_check_in_time": sch_checkin_time,
-                            "check_in": checkin_time,
-                            "is_late_card": checkin_time > will_datetime_start,
-                        })
-                    elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
-                        attendance_obj.sudo().write({
-                            "sch_check_out_time": sch_checkin_time,
-                            "check_out": checkin_time,
-                            "is_early_card": will_datetime_end > checkin_time,
-                        })
-                    elif attendance_obj.is_early_card or attendance_obj.is_late_card:
-                        attendance_obj.sudo().write({"is_abnormal": True})
-                else:
-                    attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
-            elif hr_employee_obj.default_planning_role_id.name == '保安部':
-                checkin_type = data.get("checkin_type", "")
-                current_datetime_start = datetime.datetime.combine(datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.min)
-                current_datetime_end = datetime.datetime.combine(datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.max)
-                planning_slot_id = self.env['planning.slot'].search([('resource_id', '=', hr_employee_obj.resource_id.id),
-                                                                     ('start_datetime', '>=', current_datetime_start),
-                                                                     ('start_datetime', '<=', current_datetime_end)])
-                if planning_slot_id:
+                if not hr_employee_obj.default_planning_role_id:
+                    checkin_type = data.get("checkin_type", "")
+                    exception_type = data.get("exception_type", "")
                     attendance_obj = self.env['hr.attendance'].sudo().create({
                         'employee_id': hr_employee_obj.id,
                         "userid": userid,
                         "current_data": current_data,
-                        "shift_id": planning_slot_id.id,
                         "attendance_type": "wx_work"
                     })
-                    if checkin_time:
-                        if checkin_time and checkin_type == "上班打卡" and not attendance_obj.check_in:
+                     # 获取考勤日历的上班下班时间
+                    min_hour_from = self.env['resource.calendar'].search([])[0].attendance_ids[0].hour_from
+                    min_hour = int(min_hour_from)
+                    min_minute = int(min_hour_from * 10 % min_hour_from)
+                    max_hour_to = self.env['resource.calendar'].search([])[-1].attendance_ids[0].hour_to
+                    max_hour = int(max_hour_to)
+                    max_minute = int(max_hour_to * 10 % max_hour_to)
+                    if attendance_obj.is_approval:# 已经审批修复无需再次进行更新数据
+                        return True
+                    # 赋值企业微信打卡数据
+                    attendance_obj.attendance_type = "wx_work"
+                    will_datetime_start = checkin_time.replace(hour=min_hour, minute=min_minute)
+                    will_datetime_end = checkin_time.replace(hour=max_hour, minute=max_minute)
+                    if exception_type != "未打卡":
+                        if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
                             attendance_obj.sudo().write({
+                                "sch_check_in_time": sch_checkin_time,
                                 "check_in": checkin_time,
-                                "is_late_card": checkin_time > planning_slot_id.start_datetime,
+                                "is_late_card": checkin_time > will_datetime_start,
                             })
-                        elif checkin_time and checkin_type == "下班打卡" and not attendance_obj.check_out:
+                        elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
                             attendance_obj.sudo().write({
+                                "sch_check_out_time": sch_checkin_time,
                                 "check_out": checkin_time,
-                                "is_early_card": planning_slot_id.end_datetime > checkin_time,
+                                "is_early_card": will_datetime_end > checkin_time,
                             })
+                        elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
+                            attendance_obj.sudo().write({
+                                "sch_check_in_time": sch_checkin_time,
+                                "check_in": checkin_time,
+                                "is_late_card": checkin_time > will_datetime_start,
+                            })
+                        elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
+                            attendance_obj.sudo().write({
+                                "sch_check_out_time": sch_checkin_time,
+                                "check_out": checkin_time,
+                                "is_early_card": will_datetime_end > checkin_time,
+                            })
+                        elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
+                            attendance_obj.sudo().write({
+                                "sch_check_in_time": sch_checkin_time,
+                                "check_in": checkin_time,
+                                "is_late_card": checkin_time > will_datetime_start,
+                            })
+                        elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
+                            attendance_obj.sudo().write({
+                                "sch_check_out_time": sch_checkin_time,
+                                "check_out": checkin_time,
+                                "is_early_card": will_datetime_end > checkin_time,
+                            })
+                        elif attendance_obj.is_early_card or attendance_obj.is_late_card:
+                            attendance_obj.sudo().write({"is_abnormal": True})
+                    else:
+                        attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
+                elif hr_employee_obj.default_planning_role_id.name == '保安部':
+                    checkin_type = data.get("checkin_type", "")
+                    current_datetime_start = datetime.datetime.combine(datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.min)
+                    current_datetime_end = datetime.datetime.combine(datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.max)
+                    planning_slot_id = self.env['planning.slot'].search([('resource_id', '=', hr_employee_obj.resource_id.id),
+                                                                         ('start_datetime', '>=', current_datetime_start),
+                                                                         ('start_datetime', '<=', current_datetime_end)])
+                    if planning_slot_id:
+                        attendance_obj = self.env['hr.attendance'].sudo().create({
+                            'employee_id': hr_employee_obj.id,
+                            "userid": userid,
+                            "current_data": current_data,
+                            "shift_id": planning_slot_id.id,
+                            "attendance_type": "wx_work"
+                        })
+                        if checkin_time:
+                            if checkin_time and checkin_type == "上班打卡" and not attendance_obj.check_in:
+                                attendance_obj.sudo().write({
+                                    "check_in": checkin_time,
+                                    "is_late_card": checkin_time > planning_slot_id.start_datetime,
+                                })
+                            elif checkin_time and checkin_type == "下班打卡" and not attendance_obj.check_out:
+                                attendance_obj.sudo().write({
+                                    "check_out": checkin_time,
+                                    "is_early_card": planning_slot_id.end_datetime > checkin_time,
+                                })
                             # elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and checkin_time < attendance_obj.check_in:
                             #     attendance_obj.sudo().write({
                             #         "check_in": checkin_time,
@@ -607,6 +606,7 @@ class HrAttendanceDetail(models.Model):
                     #             # 进行关联
             attendance_detail_obj.hr_attendance_id = attendance_obj.id
             return True
+
     def get_hr_attendance_time(self):
         """
         获取企业微信打卡数据的核心逻辑

From 0448aeb574e01b7b4d91381f0ebd54bed4f21bd1 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 19 Dec 2024 19:46:08 +0800
Subject: [PATCH 04/13] =?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_wechat/models/hr_attendance_detail.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yuthon_wechat/models/hr_attendance_detail.py b/yuthon_wechat/models/hr_attendance_detail.py
index e69649a96..7c0817293 100644
--- a/yuthon_wechat/models/hr_attendance_detail.py
+++ b/yuthon_wechat/models/hr_attendance_detail.py
@@ -604,8 +604,8 @@ class HrAttendanceDetail(models.Model):
                     #         else:
                     #             attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
                     #             # 进行关联
-            attendance_detail_obj.hr_attendance_id = attendance_obj.id
-            return True
+                attendance_detail_obj.hr_attendance_id = attendance_obj.id
+                return True
 
     def get_hr_attendance_time(self):
         """

From 34b9ba10e65f238f56e7c82c1e77fabc8a58b6aa Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 19 Dec 2024 20:04:03 +0800
Subject: [PATCH 05/13] =?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_wechat/models/hr_attendance_detail.py | 188 ++++++++++---------
 1 file changed, 95 insertions(+), 93 deletions(-)

diff --git a/yuthon_wechat/models/hr_attendance_detail.py b/yuthon_wechat/models/hr_attendance_detail.py
index 7c0817293..c60142a86 100644
--- a/yuthon_wechat/models/hr_attendance_detail.py
+++ b/yuthon_wechat/models/hr_attendance_detail.py
@@ -245,8 +245,6 @@ class HrAttendanceDetail(models.Model):
                 res_user_obj = self.env['res.users'].search([("oauth_uid", "=", userid)], limit=1)
                 hr_employee_obj = self.env['hr.employee'].sudo().search([("user_id", "=", res_user_obj.id)], limit=1)
                 if not hr_employee_obj.default_planning_role_id:
-                    checkin_type = data.get("checkin_type", "")
-                    exception_type = data.get("exception_type", "")
                     attendance_obj = self.env['hr.attendance'].sudo().create({
                         'employee_id': hr_employee_obj.id,
                         "userid": userid,
@@ -254,60 +252,62 @@ class HrAttendanceDetail(models.Model):
                         "attendance_type": "wx_work"
                     })
                      # 获取考勤日历的上班下班时间
-                    min_hour_from = self.env['resource.calendar'].search([])[0].attendance_ids[0].hour_from
-                    min_hour = int(min_hour_from)
-                    min_minute = int(min_hour_from * 10 % min_hour_from)
-                    max_hour_to = self.env['resource.calendar'].search([])[-1].attendance_ids[0].hour_to
-                    max_hour = int(max_hour_to)
-                    max_minute = int(max_hour_to * 10 % max_hour_to)
-                    if attendance_obj.is_approval:# 已经审批修复无需再次进行更新数据
-                        return True
-                    # 赋值企业微信打卡数据
-                    attendance_obj.attendance_type = "wx_work"
-                    will_datetime_start = checkin_time.replace(hour=min_hour, minute=min_minute)
-                    will_datetime_end = checkin_time.replace(hour=max_hour, minute=max_minute)
-                    if exception_type != "未打卡":
-                        if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
-                            attendance_obj.sudo().write({
-                                "sch_check_in_time": sch_checkin_time,
-                                "check_in": checkin_time,
-                                "is_late_card": checkin_time > will_datetime_start,
-                            })
-                        elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
-                            attendance_obj.sudo().write({
-                                "sch_check_out_time": sch_checkin_time,
-                                "check_out": checkin_time,
-                                "is_early_card": will_datetime_end > checkin_time,
-                            })
-                        elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
-                            attendance_obj.sudo().write({
-                                "sch_check_in_time": sch_checkin_time,
-                                "check_in": checkin_time,
-                                "is_late_card": checkin_time > will_datetime_start,
-                            })
-                        elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
-                            attendance_obj.sudo().write({
-                                "sch_check_out_time": sch_checkin_time,
-                                "check_out": checkin_time,
-                                "is_early_card": will_datetime_end > checkin_time,
-                            })
-                        elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
-                            attendance_obj.sudo().write({
-                                "sch_check_in_time": sch_checkin_time,
-                                "check_in": checkin_time,
-                                "is_late_card": checkin_time > will_datetime_start,
-                            })
-                        elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
-                            attendance_obj.sudo().write({
-                                "sch_check_out_time": sch_checkin_time,
-                                "check_out": checkin_time,
-                                "is_early_card": will_datetime_end > checkin_time,
-                            })
-                        elif attendance_obj.is_early_card or attendance_obj.is_late_card:
-                            attendance_obj.sudo().write({"is_abnormal": True})
-                    else:
-                        attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
-                elif hr_employee_obj.default_planning_role_id.name == '保安部':
+            min_hour_from = self.env['resource.calendar'].search([])[0].attendance_ids[0].hour_from
+            min_hour = int(min_hour_from)
+            min_minute = int(min_hour_from * 10 % min_hour_from)
+            max_hour_to = self.env['resource.calendar'].search([])[-1].attendance_ids[0].hour_to
+            max_hour = int(max_hour_to)
+            max_minute = int(max_hour_to * 10 % max_hour_to)
+            checkin_type = data.get("checkin_type", "")
+            exception_type = data.get("exception_type", "")
+            if attendance_obj.is_approval:# 已经审批修复无需再次进行更新数据
+                return True
+            # 赋值企业微信打卡数据
+            attendance_obj.attendance_type = "wx_work"
+            will_datetime_start = checkin_time.replace(hour=min_hour, minute=min_minute)
+            will_datetime_end = checkin_time.replace(hour=max_hour, minute=max_minute)
+            if exception_type != "未打卡":
+                if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
+                    attendance_obj.sudo().write({
+                        "sch_check_in_time": sch_checkin_time,
+                        "check_in": checkin_time,
+                        "is_late_card": checkin_time > will_datetime_start,
+                    })
+                elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
+                    attendance_obj.sudo().write({
+                        "sch_check_out_time": sch_checkin_time,
+                        "check_out": checkin_time,
+                        "is_early_card": will_datetime_end > checkin_time,
+                    })
+                elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
+                    attendance_obj.sudo().write({
+                        "sch_check_in_time": sch_checkin_time,
+                        "check_in": checkin_time,
+                        "is_late_card": checkin_time > will_datetime_start,
+                    })
+                elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
+                    attendance_obj.sudo().write({
+                        "sch_check_out_time": sch_checkin_time,
+                        "check_out": checkin_time,
+                        "is_early_card": will_datetime_end > checkin_time,
+                    })
+                elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
+                    attendance_obj.sudo().write({
+                        "sch_check_in_time": sch_checkin_time,
+                        "check_in": checkin_time,
+                        "is_late_card": checkin_time > will_datetime_start,
+                    })
+                elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
+                    attendance_obj.sudo().write({
+                        "sch_check_out_time": sch_checkin_time,
+                        "check_out": checkin_time,
+                        "is_early_card": will_datetime_end > checkin_time,
+                    })
+                elif attendance_obj.is_early_card or attendance_obj.is_late_card:
+                    attendance_obj.sudo().write({"is_abnormal": True})
+            else:
+                attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
+                if hr_employee_obj.default_planning_role_id.name == '保安部':
                     checkin_type = data.get("checkin_type", "")
                     current_datetime_start = datetime.datetime.combine(datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.min)
                     current_datetime_end = datetime.datetime.combine(datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.max)
@@ -322,41 +322,43 @@ class HrAttendanceDetail(models.Model):
                             "shift_id": planning_slot_id.id,
                             "attendance_type": "wx_work"
                         })
-                        if checkin_time:
-                            if checkin_time and checkin_type == "上班打卡" and not attendance_obj.check_in:
-                                attendance_obj.sudo().write({
-                                    "check_in": checkin_time,
-                                    "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                                })
-                            elif checkin_time and checkin_type == "下班打卡" and not attendance_obj.check_out:
-                                attendance_obj.sudo().write({
-                                    "check_out": checkin_time,
-                                    "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                                })
-                            # elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and checkin_time < attendance_obj.check_in:
-                            #     attendance_obj.sudo().write({
-                            #         "check_in": checkin_time,
-                            #         "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                            #     })
-                            # elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and checkin_time > attendance_obj.check_out:
-                            #     attendance_obj.sudo().write({
-                            #         "check_out": checkin_time,
-                            #         "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                            #     })
-                            # elif checkin_time and not attendance_obj.check_in and not attendance_obj.check_out:
-                            #     attendance_obj.sudo().write({
-                            #         "check_in": checkin_time,
-                            #         "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                            #     })
-                            # elif checkin_time and attendance_obj.check_in and not attendance_obj.check_out:
-                            #     attendance_obj.sudo().write({
-                            #         "check_out": checkin_time,
-                            #         "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                            #     })
-                        elif attendance_obj.is_early_card or attendance_obj.is_late_card:
-                            attendance_obj.sudo().write({"is_abnormal": True})
-                    else:
-                        attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
+                        will_datetime_start = planning_slot_id.start_datetime
+                        will_datetime_end = planning_slot_id.end_datetime
+            if checkin_time:
+                if checkin_time and checkin_type == "上班打卡" and not attendance_obj.check_in:
+                    attendance_obj.sudo().write({
+                        "check_in": checkin_time,
+                        "is_late_card": checkin_time > will_datetime_start
+                    })
+                elif checkin_time and checkin_type == "下班打卡" and not attendance_obj.check_out:
+                    attendance_obj.sudo().write({
+                        "check_out": checkin_time,
+                        "is_early_card": will_datetime_end > checkin_time,
+                    })
+                    # elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and checkin_time < attendance_obj.check_in:
+                    #     attendance_obj.sudo().write({
+                    #         "check_in": checkin_time,
+                    #         "is_late_card": checkin_time > planning_slot_id.start_datetime,
+                    #     })
+                    # elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and checkin_time > attendance_obj.check_out:
+                    #     attendance_obj.sudo().write({
+                    #         "check_out": checkin_time,
+                    #         "is_early_card": planning_slot_id.end_datetime > checkin_time,
+                    #     })
+                    # elif checkin_time and not attendance_obj.check_in and not attendance_obj.check_out:
+                    #     attendance_obj.sudo().write({
+                    #         "check_in": checkin_time,
+                    #         "is_late_card": checkin_time > planning_slot_id.start_datetime,
+                    #     })
+                    # elif checkin_time and attendance_obj.check_in and not attendance_obj.check_out:
+                    #     attendance_obj.sudo().write({
+                    #         "check_out": checkin_time,
+                    #         "is_early_card": planning_slot_id.end_datetime > checkin_time,
+                    #     })
+                elif attendance_obj.is_early_card or attendance_obj.is_late_card:
+                    attendance_obj.sudo().write({"is_abnormal": True})
+            else:
+                attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
                     # elif planning_slot_id.department_id.name == '工程部':
                     #     attendance_obj = self.env['hr.attendance'].sudo().create({
                     #         'employee_id': hr_employee_obj.id,
@@ -604,8 +606,8 @@ class HrAttendanceDetail(models.Model):
                     #         else:
                     #             attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
                     #             # 进行关联
-                attendance_detail_obj.hr_attendance_id = attendance_obj.id
-                return True
+            attendance_detail_obj.hr_attendance_id = attendance_obj.id
+            return True
 
     def get_hr_attendance_time(self):
         """

From 7de59048d920b5b3de199dbb1c2c888b2529de71 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 19 Dec 2024 20:10:54 +0800
Subject: [PATCH 06/13] =?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_wechat/models/hr_attendance_detail.py | 227 ++++++++++---------
 1 file changed, 122 insertions(+), 105 deletions(-)

diff --git a/yuthon_wechat/models/hr_attendance_detail.py b/yuthon_wechat/models/hr_attendance_detail.py
index c60142a86..a76fbb446 100644
--- a/yuthon_wechat/models/hr_attendance_detail.py
+++ b/yuthon_wechat/models/hr_attendance_detail.py
@@ -244,121 +244,138 @@ class HrAttendanceDetail(models.Model):
             if not attendance_obj:
                 res_user_obj = self.env['res.users'].search([("oauth_uid", "=", userid)], limit=1)
                 hr_employee_obj = self.env['hr.employee'].sudo().search([("user_id", "=", res_user_obj.id)], limit=1)
-                if not hr_employee_obj.default_planning_role_id:
-                    attendance_obj = self.env['hr.attendance'].sudo().create({
-                        'employee_id': hr_employee_obj.id,
-                        "userid": userid,
-                        "current_data": current_data,
-                        "attendance_type": "wx_work"
-                    })
-                     # 获取考勤日历的上班下班时间
+                attendance_obj = self.env['hr.attendance'].sudo().create({
+                    'employee_id': hr_employee_obj.id,
+                    "userid": userid,
+                    "current_data": current_data,
+                    "attendance_type": "wx_work"
+                })
+            # 获取考勤日历的上班下班时间
             min_hour_from = self.env['resource.calendar'].search([])[0].attendance_ids[0].hour_from
             min_hour = int(min_hour_from)
             min_minute = int(min_hour_from * 10 % min_hour_from)
             max_hour_to = self.env['resource.calendar'].search([])[-1].attendance_ids[0].hour_to
             max_hour = int(max_hour_to)
             max_minute = int(max_hour_to * 10 % max_hour_to)
-            checkin_type = data.get("checkin_type", "")
-            exception_type = data.get("exception_type", "")
-            if attendance_obj.is_approval:# 已经审批修复无需再次进行更新数据
+            if attendance_obj.is_approval:
+                # 已经审批修复无需再次进行更新数据
                 return True
             # 赋值企业微信打卡数据
             attendance_obj.attendance_type = "wx_work"
+            checkin_type = data.get("checkin_type", "")
+            exception_type = data.get("exception_type", "")
             will_datetime_start = checkin_time.replace(hour=min_hour, minute=min_minute)
             will_datetime_end = checkin_time.replace(hour=max_hour, minute=max_minute)
-            if exception_type != "未打卡":
-                if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
-                    attendance_obj.sudo().write({
-                        "sch_check_in_time": sch_checkin_time,
-                        "check_in": checkin_time,
-                        "is_late_card": checkin_time > will_datetime_start,
-                    })
-                elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
-                    attendance_obj.sudo().write({
-                        "sch_check_out_time": sch_checkin_time,
-                        "check_out": checkin_time,
-                        "is_early_card": will_datetime_end > checkin_time,
-                    })
-                elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
-                    attendance_obj.sudo().write({
-                        "sch_check_in_time": sch_checkin_time,
-                        "check_in": checkin_time,
-                        "is_late_card": checkin_time > will_datetime_start,
-                    })
-                elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
-                    attendance_obj.sudo().write({
-                        "sch_check_out_time": sch_checkin_time,
-                        "check_out": checkin_time,
-                        "is_early_card": will_datetime_end > checkin_time,
-                    })
-                elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
-                    attendance_obj.sudo().write({
-                        "sch_check_in_time": sch_checkin_time,
-                        "check_in": checkin_time,
-                        "is_late_card": checkin_time > will_datetime_start,
-                    })
-                elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
-                    attendance_obj.sudo().write({
-                        "sch_check_out_time": sch_checkin_time,
-                        "check_out": checkin_time,
-                        "is_early_card": will_datetime_end > checkin_time,
-                    })
-                elif attendance_obj.is_early_card or attendance_obj.is_late_card:
-                    attendance_obj.sudo().write({"is_abnormal": True})
-            else:
-                attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
-                if hr_employee_obj.default_planning_role_id.name == '保安部':
-                    checkin_type = data.get("checkin_type", "")
-                    current_datetime_start = datetime.datetime.combine(datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.min)
-                    current_datetime_end = datetime.datetime.combine(datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.max)
-                    planning_slot_id = self.env['planning.slot'].search([('resource_id', '=', hr_employee_obj.resource_id.id),
-                                                                         ('start_datetime', '>=', current_datetime_start),
-                                                                         ('start_datetime', '<=', current_datetime_end)])
-                    if planning_slot_id:
-                        attendance_obj = self.env['hr.attendance'].sudo().create({
-                            'employee_id': hr_employee_obj.id,
-                            "userid": userid,
-                            "current_data": current_data,
-                            "shift_id": planning_slot_id.id,
-                            "attendance_type": "wx_work"
+            if hr_employee_obj.default_planning_role_id:
+                if exception_type != "未打卡":
+                    if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
+                        attendance_obj.sudo().write({
+                            "sch_check_in_time": sch_checkin_time,
+                            "check_in": checkin_time,
+                            "is_late_card": checkin_time > will_datetime_start,
                         })
-                        will_datetime_start = planning_slot_id.start_datetime
-                        will_datetime_end = planning_slot_id.end_datetime
-            if checkin_time:
-                if checkin_time and checkin_type == "上班打卡" and not attendance_obj.check_in:
-                    attendance_obj.sudo().write({
-                        "check_in": checkin_time,
-                        "is_late_card": checkin_time > will_datetime_start
-                    })
-                elif checkin_time and checkin_type == "下班打卡" and not attendance_obj.check_out:
-                    attendance_obj.sudo().write({
-                        "check_out": checkin_time,
-                        "is_early_card": will_datetime_end > checkin_time,
-                    })
-                    # elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and checkin_time < attendance_obj.check_in:
-                    #     attendance_obj.sudo().write({
-                    #         "check_in": checkin_time,
-                    #         "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #     })
-                    # elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and checkin_time > attendance_obj.check_out:
-                    #     attendance_obj.sudo().write({
-                    #         "check_out": checkin_time,
-                    #         "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #     })
-                    # elif checkin_time and not attendance_obj.check_in and not attendance_obj.check_out:
-                    #     attendance_obj.sudo().write({
-                    #         "check_in": checkin_time,
-                    #         "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #     })
-                    # elif checkin_time and attendance_obj.check_in and not attendance_obj.check_out:
-                    #     attendance_obj.sudo().write({
-                    #         "check_out": checkin_time,
-                    #         "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #     })
-                elif attendance_obj.is_early_card or attendance_obj.is_late_card:
-                    attendance_obj.sudo().write({"is_abnormal": True})
-            else:
-                attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
+                    elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
+                        attendance_obj.sudo().write({
+                            "sch_check_out_time": sch_checkin_time,
+                            "check_out": checkin_time,
+                            "is_early_card": will_datetime_end > checkin_time,
+                        })
+                    elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
+                        attendance_obj.sudo().write({
+                            "sch_check_in_time": sch_checkin_time,
+                            "check_in": checkin_time,
+                            "is_late_card": checkin_time > will_datetime_start,
+                        })
+                    elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
+                        attendance_obj.sudo().write({
+                            "sch_check_out_time": sch_checkin_time,
+                            "check_out": checkin_time,
+                            "is_early_card": will_datetime_end > checkin_time,
+                        })
+                    elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
+                        attendance_obj.sudo().write({
+                            "sch_check_in_time": sch_checkin_time,
+                            "check_in": checkin_time,
+                            "is_late_card": checkin_time > will_datetime_start,
+                        })
+                    elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
+                        attendance_obj.sudo().write({
+                            "sch_check_out_time": sch_checkin_time,
+                            "check_out": checkin_time,
+                            "is_early_card": will_datetime_end > checkin_time,
+                        })
+                    elif attendance_obj.is_early_card or attendance_obj.is_late_card:
+                        attendance_obj.sudo().write({"is_abnormal": True})
+                else:
+                    attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
+            # else:
+            #     current_datetime_start = datetime.datetime.combine(current_data, datetime.time.min)
+            #     current_datetime_end = datetime.datetime.combine(current_data, datetime.time.max)
+            #     planning_slot_id = self.env['planning.slot'].search([('resource_id', '=', hr_employee_obj.resource_id.id),
+            #                                                          ('start_datetime', '>=', current_datetime_start),
+            #                                                          # 大于等于起始日期
+            #                                                          ('start_datetime', '<=', current_datetime_end)])
+            #
+            #     attendance_obj = self.env['hr.attendance'].sudo().create({
+            #         'employee_id': hr_employee_obj.id,
+            #         "userid": userid,
+            #         "current_data": current_data,
+            #         "shift_id": planning_slot_id.id if planning_slot_id else False,
+            #         "attendance_type": "wx_work"
+            #     })
+            #     if attendance_obj.is_approval:
+            #         # 已经审批修复无需再次进行更新数据
+            #         return True
+            #     # 赋值企业微信打卡数据
+            #     attendance_obj.attendance_type = "wx_work"
+            #     checkin_type = data.get("checkin_type", "")
+            #     exception_type = data.get("exception_type", "")
+            #     if exception_type != "未打卡":
+            #         if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
+            #             attendance_obj.sudo().write({
+            #                 "sch_check_in_time": planning_slot_id.start_datetime,
+            #                 "check_in": checkin_time,
+            #                 "is_late_card": checkin_time > planning_slot_id.start_datetime,
+            #             })
+            #         elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
+            #             attendance_obj.sudo().write({
+            #                 "sch_check_out_time": planning_slot_id.end_datetime,
+            #                 "check_out": checkin_time,
+            #                 "is_early_card": planning_slot_id.end_datetime > checkin_time,
+            #             })
+            #         elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
+            #             attendance_obj.sudo().write({
+            #                 "sch_check_in_time": planning_slot_id.start_datetime,
+            #                 "check_in": checkin_time,
+            #                 "is_late_card": checkin_time > planning_slot_id.start_datetime,
+            #             })
+            #         elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
+            #             attendance_obj.sudo().write({
+            #                 "sch_check_out_time": planning_slot_id.end_datetime,
+            #                 "check_out": checkin_time,
+            #             })
+            #         elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
+            #             attendance_obj.sudo().write({
+            #                 "sch_check_in_time": planning_slot_id.start_datetime,
+            #                 "check_in": checkin_time,
+            #             })
+            #         elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
+            #             attendance_obj.sudo().write({
+            #                 "sch_check_out_time": planning_slot_id.end_datetime,
+            #                 "check_out": checkin_time,
+            #             })
+            #         elif attendance_obj.is_late_card or attendance_obj.is_early_card:
+            #             attendance_obj.sudo().write({'is_abnormal': True, })
+            #     else:
+            #         if not planning_slot_id:
+            #             attendance_obj.sudo().write({
+            #                 "is_early_card": False,
+            #                 "is_late_card": False,
+            #                 "is_no_card": False,
+            #                 "is_abnormal": False,
+            #             })
+            #         else:
+            #             attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
                     # elif planning_slot_id.department_id.name == '工程部':
                     #     attendance_obj = self.env['hr.attendance'].sudo().create({
                     #         'employee_id': hr_employee_obj.id,
@@ -606,8 +623,8 @@ class HrAttendanceDetail(models.Model):
                     #         else:
                     #             attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
                     #             # 进行关联
-            attendance_detail_obj.hr_attendance_id = attendance_obj.id
-            return True
+                attendance_detail_obj.hr_attendance_id = attendance_obj.id
+                return True
 
     def get_hr_attendance_time(self):
         """

From a6844190623a9a251c821b38fd08a72ff0ccc7f9 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 19 Dec 2024 20:16:03 +0800
Subject: [PATCH 07/13] =?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_wechat/models/hr_attendance_detail.py | 83 ++++++++++----------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/yuthon_wechat/models/hr_attendance_detail.py b/yuthon_wechat/models/hr_attendance_detail.py
index a76fbb446..a0fa30231 100644
--- a/yuthon_wechat/models/hr_attendance_detail.py
+++ b/yuthon_wechat/models/hr_attendance_detail.py
@@ -266,48 +266,47 @@ class HrAttendanceDetail(models.Model):
             exception_type = data.get("exception_type", "")
             will_datetime_start = checkin_time.replace(hour=min_hour, minute=min_minute)
             will_datetime_end = checkin_time.replace(hour=max_hour, minute=max_minute)
-            if hr_employee_obj.default_planning_role_id:
-                if exception_type != "未打卡":
-                    if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
-                        attendance_obj.sudo().write({
-                            "sch_check_in_time": sch_checkin_time,
-                            "check_in": checkin_time,
-                            "is_late_card": checkin_time > will_datetime_start,
-                        })
-                    elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
-                        attendance_obj.sudo().write({
-                            "sch_check_out_time": sch_checkin_time,
-                            "check_out": checkin_time,
-                            "is_early_card": will_datetime_end > checkin_time,
-                        })
-                    elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
-                        attendance_obj.sudo().write({
-                            "sch_check_in_time": sch_checkin_time,
-                            "check_in": checkin_time,
-                            "is_late_card": checkin_time > will_datetime_start,
-                        })
-                    elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
-                        attendance_obj.sudo().write({
-                            "sch_check_out_time": sch_checkin_time,
-                            "check_out": checkin_time,
-                            "is_early_card": will_datetime_end > checkin_time,
-                        })
-                    elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
-                        attendance_obj.sudo().write({
-                            "sch_check_in_time": sch_checkin_time,
-                            "check_in": checkin_time,
-                            "is_late_card": checkin_time > will_datetime_start,
-                        })
-                    elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
-                        attendance_obj.sudo().write({
-                            "sch_check_out_time": sch_checkin_time,
-                            "check_out": checkin_time,
-                            "is_early_card": will_datetime_end > checkin_time,
-                        })
-                    elif attendance_obj.is_early_card or attendance_obj.is_late_card:
-                        attendance_obj.sudo().write({"is_abnormal": True})
-                else:
-                    attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
+            if exception_type != "未打卡":
+                if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
+                    attendance_obj.sudo().write({
+                        "sch_check_in_time": sch_checkin_time,
+                        "check_in": checkin_time,
+                        "is_late_card": checkin_time > will_datetime_start,
+                    })
+                elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
+                    attendance_obj.sudo().write({
+                        "sch_check_out_time": sch_checkin_time,
+                        "check_out": checkin_time,
+                        "is_early_card": will_datetime_end > checkin_time,
+                    })
+                elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
+                    attendance_obj.sudo().write({
+                        "sch_check_in_time": sch_checkin_time,
+                        "check_in": checkin_time,
+                        "is_late_card": checkin_time > will_datetime_start,
+                    })
+                elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
+                    attendance_obj.sudo().write({
+                        "sch_check_out_time": sch_checkin_time,
+                        "check_out": checkin_time,
+                        "is_early_card": will_datetime_end > checkin_time,
+                    })
+                elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
+                    attendance_obj.sudo().write({
+                        "sch_check_in_time": sch_checkin_time,
+                        "check_in": checkin_time,
+                        "is_late_card": checkin_time > will_datetime_start,
+                    })
+                elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
+                    attendance_obj.sudo().write({
+                        "sch_check_out_time": sch_checkin_time,
+                        "check_out": checkin_time,
+                        "is_early_card": will_datetime_end > checkin_time,
+                    })
+                elif attendance_obj.is_early_card or attendance_obj.is_late_card:
+                    attendance_obj.sudo().write({"is_abnormal": True})
+            else:
+                attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
             # else:
             #     current_datetime_start = datetime.datetime.combine(current_data, datetime.time.min)
             #     current_datetime_end = datetime.datetime.combine(current_data, datetime.time.max)

From 35d52e5c4fef81bb464917004c1f82ef18d8217b Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 19 Dec 2024 20:31:04 +0800
Subject: [PATCH 08/13] =?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_wechat/models/hr_attendance_detail.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yuthon_wechat/models/hr_attendance_detail.py b/yuthon_wechat/models/hr_attendance_detail.py
index a0fa30231..6a492177d 100644
--- a/yuthon_wechat/models/hr_attendance_detail.py
+++ b/yuthon_wechat/models/hr_attendance_detail.py
@@ -622,8 +622,8 @@ class HrAttendanceDetail(models.Model):
                     #         else:
                     #             attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
                     #             # 进行关联
-                attendance_detail_obj.hr_attendance_id = attendance_obj.id
-                return True
+            attendance_detail_obj.hr_attendance_id = attendance_obj.id
+            return True
 
     def get_hr_attendance_time(self):
         """

From 48c53370e923fb98e1b733474df5b927ff65b972 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Thu, 19 Dec 2024 20:49:35 +0800
Subject: [PATCH 09/13] =?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_wechat/models/hr_attendance_detail.py | 316 +------------------
 1 file changed, 1 insertion(+), 315 deletions(-)

diff --git a/yuthon_wechat/models/hr_attendance_detail.py b/yuthon_wechat/models/hr_attendance_detail.py
index 6a492177d..bf7b06ad2 100644
--- a/yuthon_wechat/models/hr_attendance_detail.py
+++ b/yuthon_wechat/models/hr_attendance_detail.py
@@ -307,321 +307,7 @@ class HrAttendanceDetail(models.Model):
                     attendance_obj.sudo().write({"is_abnormal": True})
             else:
                 attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
-            # else:
-            #     current_datetime_start = datetime.datetime.combine(current_data, datetime.time.min)
-            #     current_datetime_end = datetime.datetime.combine(current_data, datetime.time.max)
-            #     planning_slot_id = self.env['planning.slot'].search([('resource_id', '=', hr_employee_obj.resource_id.id),
-            #                                                          ('start_datetime', '>=', current_datetime_start),
-            #                                                          # 大于等于起始日期
-            #                                                          ('start_datetime', '<=', current_datetime_end)])
-            #
-            #     attendance_obj = self.env['hr.attendance'].sudo().create({
-            #         'employee_id': hr_employee_obj.id,
-            #         "userid": userid,
-            #         "current_data": current_data,
-            #         "shift_id": planning_slot_id.id if planning_slot_id else False,
-            #         "attendance_type": "wx_work"
-            #     })
-            #     if attendance_obj.is_approval:
-            #         # 已经审批修复无需再次进行更新数据
-            #         return True
-            #     # 赋值企业微信打卡数据
-            #     attendance_obj.attendance_type = "wx_work"
-            #     checkin_type = data.get("checkin_type", "")
-            #     exception_type = data.get("exception_type", "")
-            #     if exception_type != "未打卡":
-            #         if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
-            #             attendance_obj.sudo().write({
-            #                 "sch_check_in_time": planning_slot_id.start_datetime,
-            #                 "check_in": checkin_time,
-            #                 "is_late_card": checkin_time > planning_slot_id.start_datetime,
-            #             })
-            #         elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
-            #             attendance_obj.sudo().write({
-            #                 "sch_check_out_time": planning_slot_id.end_datetime,
-            #                 "check_out": checkin_time,
-            #                 "is_early_card": planning_slot_id.end_datetime > checkin_time,
-            #             })
-            #         elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
-            #             attendance_obj.sudo().write({
-            #                 "sch_check_in_time": planning_slot_id.start_datetime,
-            #                 "check_in": checkin_time,
-            #                 "is_late_card": checkin_time > planning_slot_id.start_datetime,
-            #             })
-            #         elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
-            #             attendance_obj.sudo().write({
-            #                 "sch_check_out_time": planning_slot_id.end_datetime,
-            #                 "check_out": checkin_time,
-            #             })
-            #         elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
-            #             attendance_obj.sudo().write({
-            #                 "sch_check_in_time": planning_slot_id.start_datetime,
-            #                 "check_in": checkin_time,
-            #             })
-            #         elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
-            #             attendance_obj.sudo().write({
-            #                 "sch_check_out_time": planning_slot_id.end_datetime,
-            #                 "check_out": checkin_time,
-            #             })
-            #         elif attendance_obj.is_late_card or attendance_obj.is_early_card:
-            #             attendance_obj.sudo().write({'is_abnormal': True, })
-            #     else:
-            #         if not planning_slot_id:
-            #             attendance_obj.sudo().write({
-            #                 "is_early_card": False,
-            #                 "is_late_card": False,
-            #                 "is_no_card": False,
-            #                 "is_abnormal": False,
-            #             })
-            #         else:
-            #             attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
-                    # elif planning_slot_id.department_id.name == '工程部':
-                    #     attendance_obj = self.env['hr.attendance'].sudo().create({
-                    #         'employee_id': hr_employee_obj.id,
-                    #         "userid": userid,
-                    #         "current_data": current_data,
-                    #         "shift_id": planning_slot_id.id,
-                    #         "attendance_type": "wx_work"
-                    #     })
-                    #     if planning_slot_id.template_id.planning_name == '中值':
-                    #         if exception_type != "未打卡":
-                    #             if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif datetime.time(11, 30)<= checkin_time <= datetime.time(13, 30):
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "noon_duty":False
-                    #                 })
-                    #             elif attendance_obj.is_early_card or attendance_obj.is_late_card or attendance_obj.noon_duty:
-                    #                 attendance_obj.sudo().write({"is_abnormal": True})
-                    #         else:
-                    #             attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
-                    #     elif planning_slot_id.template_id.planning_name == '夜值':
-                    #         if exception_type != "未打卡":
-                    #             if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif (datetime.time(9, 30) <= checkin_time <= datetime.time(23, 59, 59) or
-                    #                   datetime.time(0, 0) <= checkin_time <= datetime.time(6, 0)):
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "night_duty": False
-                    #                 })
-                    #             elif attendance_obj.is_early_card or attendance_obj.is_late_card or attendance_obj.night_duty:
-                    #                 attendance_obj.sudo().write({"is_abnormal": True})
-                    #         else:
-                    #             attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
-                    #     else:
-                    #         if exception_type != "未打卡":
-                    #             if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif attendance_obj.is_early_card or attendance_obj.is_late_card or attendance_obj.noon_duty:
-                    #                 attendance_obj.sudo().write({"is_abnormal": True})
-                    #         else:
-                    #             attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
-                    # elif planning_slot_id.department_id.name == '联安粮库':
-                    #     attendance_obj = self.env['hr.attendance'].sudo().create({
-                    #         'employee_id': hr_employee_obj.id,
-                    #         "userid": userid,
-                    #         "current_data": current_data,
-                    #         "shift_id": planning_slot_id.id,
-                    #         "attendance_type": "wx_work"
-                    #     })
-                    #     if planning_slot_id.template_id.planning_name == '夜值':
-                    #         if exception_type != "未打卡":
-                    #             if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif (datetime.time(9, 30) <= checkin_time <= datetime.time(23, 59, 59) or
-                    #                   datetime.time(0, 0) <= checkin_time <= datetime.time(6, 0)):
-                    #                   attendance_obj.sudo().write({
-                    #                         "sch_check_out_time": sch_checkin_time,
-                    #                         "check_out": checkin_time,
-                    #                         "night_duty": False
-                    #                   })
-                    #             elif attendance_obj.is_early_card or attendance_obj.is_late_card or attendance_obj.noon_duty:
-                    #                 attendance_obj.sudo().write({"is_abnormal": True})
-                    #         else:
-                    #             attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
-                    #     else:
-                    #         if exception_type != "未打卡":
-                    #             if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_in_time": sch_checkin_time,
-                    #                     "check_in": checkin_time,
-                    #                     "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    #                 })
-                    #             elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
-                    #                 attendance_obj.sudo().write({
-                    #                     "sch_check_out_time": sch_checkin_time,
-                    #                     "check_out": checkin_time,
-                    #                     "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    #                 })
-                    #             elif attendance_obj.is_early_card or attendance_obj.is_late_card:
-                    #                 attendance_obj.sudo().write({"is_abnormal": True})
-                    #         else:
-                    #             attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
-                    #             # 进行关联
+            # 进行关联
             attendance_detail_obj.hr_attendance_id = attendance_obj.id
             return True
 

From f05178a8e334027d5bbe06a95c8f1dc557528fb6 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Fri, 20 Dec 2024 10:27:22 +0800
Subject: [PATCH 10/13] =?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_holiday/views/hr_leave_batch.xml       |  6 ++---
 yuthon_property/models/yuthon_property.py     |  1 +
 .../views/yuthon_property_views.xml           |  5 ++++
 .../models/property_lease_contract.py         | 15 ++++++------
 .../models/property_offline_registration.py   |  2 +-
 .../views/property_lease_contract.xml         | 24 ++++++-------------
 6 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml
index 11b285bc6..0bc11f7ac 100644
--- a/yuthon_holiday/views/hr_leave_batch.xml
+++ b/yuthon_holiday/views/hr_leave_batch.xml
@@ -36,9 +36,6 @@
                                 <field name="department_id" invisible="1"/>
                                 <field name="is_issues" invisible="1"/>
                             </group>
-                            <group>
-                                <field name="details" readonly="1"/>
-                            </group>
                         </group>
                         <group string="按天请假" invisible="not is_day"/>
                         <field name="leave_ids" invisible="not is_day"
@@ -128,6 +125,9 @@
                                 <field name="custom_document_ids" widget="preview_many2many" options="{'show_select_btn': false}"/>
                             </tree>
                         </field>
+                        <group>
+                                <field name="details" readonly="1"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index 17c222cb9..8a2b75eec 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -67,6 +67,7 @@ class YuthonProperty(models.Model):
     suite_area = fields.Float(string="套内面积")
     start_time = fields.Date(string="生效时间")
     end_date = fields.Date(string="失效日期")
+    lessee_id = fields.Many2one('yuthon.property.lessee', string='承租方')
     manage_standard = fields.Char(string="物业管理费标准")
     title_address = fields.Char(string="产权地址")
     rental_address = fields.Char(string="出租地址")
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 31ee8dc50..339983877 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -29,6 +29,7 @@
                     <group string="基本信息">
                         <group>
                             <field name="name" required="1"/>
+                            <field name="lessee_id"/>
                             <field name="premises"/>
                             <field name="units"/>
                             <field name="house_type_id"/>
@@ -225,6 +226,10 @@
                                             <span>管理员:</span>
                                             <field name="admin_id"/>
                                         </div>
+                                        <div>
+                                            <span>承租方:</span>
+                                            <field name="lessee_id"/>
+                                        </div>
                                     </div>
                                 </div>
                                 <div name="tags"/>
diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py
index 140cad350..067f75fd7 100644
--- a/yuthon_property_approval/models/property_lease_contract.py
+++ b/yuthon_property_approval/models/property_lease_contract.py
@@ -49,17 +49,11 @@ class PropertyLeaseContract(models.Model):
     cycle_mode = fields.Selection([('fixed','合同月'), ('floating','自然月')],string='周期方式')
     expected_reminders = fields.Char(string="逾期提醒")
     increment_method = fields.Selection([('percentage','百分比'),('increment_price','递增单价'),('increment_amount','递增金额')], string='每月递增')
-    increment_percentage = fields.Float(string="递增百分比")
-    increment_price = fields.Float(string="递增单价")
-    increment_amount = fields.Float(string="递增金额")
-    rent_free_period = fields.Char(string="免租期")
+    rent_free_period = fields.Datetime(string="免租期")
     breach_time = fields.Date(string="违约计算时点")
     percentage_liquidated_damages = fields.Char(string="违约金比例")
     date_of_payment = fields.Date(string="每月支付日期")
     unit_price = fields.Float(string="单价")
-    management_fee = fields.Float(string="管理费")
-    water = fields.Float(string="水费")
-    tariff = fields.Float(string="电费")
     deposit = fields.Float(string="押金/履约保证金")
     first_year_rent = fields.Float(string="首年租金")
     total_contract_receivables = fields.Float(string="合同应收")
@@ -67,7 +61,7 @@ class PropertyLeaseContract(models.Model):
     not_tax_amount = fields.Float(string="不含税价")
     tax = fields.Float(string="税金")
     miscellaneous = fields.Char(string="其他约定")
-    total_area = fields.Float(string="总面积")
+    total_area = fields.Float(string="总面积", digits=(16, 4))
 
     lease_ids = fields.One2many('property.lease.contract.line', 'lease_id',string="租赁信息明细行")
     breakdown_ids = fields.One2many('property.rent.breakdown.line', 'breakdown_id', string="物业租金明细行")
@@ -336,6 +330,11 @@ class PropertyLeaseContract(models.Model):
                         "period_rent": period_rent * months,
                     })
 
+    @api.onchange("first_year_rent")
+    def _onchange_first_year_rent(self):
+        for rec in self:
+            rec.deposit = rec.first_year_rent * 2
+
 class PropertyLeaseContractLine(models.Model):
     _name = 'property.lease.contract.line'
     _description = '物业列表明细行'
diff --git a/yuthon_property_approval/models/property_offline_registration.py b/yuthon_property_approval/models/property_offline_registration.py
index 7c07da8c8..631986389 100644
--- a/yuthon_property_approval/models/property_offline_registration.py
+++ b/yuthon_property_approval/models/property_offline_registration.py
@@ -13,7 +13,7 @@ class PropertyOfflineRegistration(models.Model):
     rental_price = fields.Float(string='租金底价(元/m²)')
     monthly_rent = fields.Float(string='月租金(元)')
     increment_rate = fields.Char(string='递增率')
-    rent_free = fields.Char(string='免租期')
+    rent_free = fields.Datetime(string='免租期')
     contract_years = fields.Char(string='签约年限')
     start_data = fields.Date(string="报价开始日期")
     end_data = fields.Date(string="报价结束日期")
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 5e36446df..34eb70d09 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -54,8 +54,8 @@
                         <group col="3" string="收费详细">
                             <group>
                                 <field name="lease_term"/>
-                                <field name="cycle_dict"/>
-                                <field name="cycle_mode"/>
+                                <field name="term_start_time"/>
+                                <field name="term_end_time" />
                             </group>
                             <group>
                                 <field name="expected_reminders"/>
@@ -63,14 +63,9 @@
                                 <field name="rent_free_period"/>
                             </group>
                             <group>
-                                <field name="increment_percentage"/>
-                                <field name="increment_price"/>
-                                <field name="increment_amount"/>
-                            </group>
-                            <group>
-                                <field name="term_start_time" />
-                                <field name="term_end_time" />
-                                <field name="total_area" />
+                                <field name="total_area"/>
+                                <field name="cycle_dict"/>
+                                <field name="cycle_mode"/>
                             </group>
                             <group>
                                 <field name="breach_time"/>
@@ -79,23 +74,18 @@
                             </group>
                             <group>
                                 <field name="unit_price"/>
-                                <field name="management_fee"/>
-                                <field name="water"/>
+                                <field name="tax"/>
                             </group>
                             <group>
-                                <field name="tariff"/>
                                 <field name="deposit"/>
                                 <field name="first_year_rent"/>
+                                <field name="miscellaneous"/>
                             </group>
                             <group>
                                 <field name="total_contract_receivables"/>
                                 <field name="tax_rate"/>
                                 <field name="not_tax_amount"/>
                             </group>
-                            <group>
-                                <field name="tax"/>
-                                <field name="miscellaneous"/>
-                            </group>
                         </group>
                     <notebook>
                         <page string="物业列表">

From 729f178bd7f522bb25748eb4d1c23f3390a0ab2f Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Fri, 20 Dec 2024 11:02:27 +0800
Subject: [PATCH 11/13] =?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/soong_workflow_log_views.xml        |  2 +-
 yuthon_wechat/models/hr_attendance_detail.py  | 46 ++++++++++++++++---
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/soong_workflow/views/soong_workflow_log_views.xml b/soong_workflow/views/soong_workflow_log_views.xml
index 66c519e17..0f5b52253 100644
--- a/soong_workflow/views/soong_workflow_log_views.xml
+++ b/soong_workflow/views/soong_workflow_log_views.xml
@@ -5,7 +5,7 @@
         <field name="name">soong.workflow.log.tree</field>
         <field name="model">soong.workflow.log</field>
         <field name="arch" type="xml">
-            <tree string="工作流日志">
+            <tree string="工作流日志" default_order="lase_click_date desc">
                 <field name="name"/>
                 <field name="model"/>
                 <field name="res_id"/>
diff --git a/yuthon_wechat/models/hr_attendance_detail.py b/yuthon_wechat/models/hr_attendance_detail.py
index bf7b06ad2..f0e9a87c4 100644
--- a/yuthon_wechat/models/hr_attendance_detail.py
+++ b/yuthon_wechat/models/hr_attendance_detail.py
@@ -244,13 +244,33 @@ class HrAttendanceDetail(models.Model):
             if not attendance_obj:
                 res_user_obj = self.env['res.users'].search([("oauth_uid", "=", userid)], limit=1)
                 hr_employee_obj = self.env['hr.employee'].sudo().search([("user_id", "=", res_user_obj.id)], limit=1)
-                attendance_obj = self.env['hr.attendance'].sudo().create({
-                    'employee_id': hr_employee_obj.id,
-                    "userid": userid,
-                    "current_data": current_data,
-                    "attendance_type": "wx_work"
-                })
-            # 获取考勤日历的上班下班时间
+                if not hr_employee_obj.default_planning_role_id:
+                    attendance_obj = self.env['hr.attendance'].sudo().create({
+                        'employee_id': hr_employee_obj.id,
+                        "userid": userid,
+                        "current_data": current_data,
+                        "attendance_type": "wx_work"
+                    })
+                else:
+                    if hr_employee_obj.default_planning_role_id.name == '保安部':
+                        current_datetime_start = datetime.datetime.combine(
+                            datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.min)
+                        current_datetime_end = datetime.datetime.combine(
+                            datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.max)
+                        planning_slot_id = self.env['planning.slot'].search(
+                            [('resource_id', '=', hr_employee_obj.resource_id.id),
+                             ('start_datetime', '>=', current_datetime_start),
+                             ('start_datetime', '<=', current_datetime_end)])
+                        if planning_slot_id:
+                            attendance_obj = self.env['hr.attendance'].sudo().create({
+                                'employee_id': hr_employee_obj.id,
+                                "userid": userid,
+                                "current_data": current_data,
+                                "shift_id": planning_slot_id.id,
+                                "attendance_type": "wx_work"
+                            })
+            planning_start_time = planning_slot_id.start_datetime
+                     # 获取考勤日历的上班下班时间
             min_hour_from = self.env['resource.calendar'].search([])[0].attendance_ids[0].hour_from
             min_hour = int(min_hour_from)
             min_minute = int(min_hour_from * 10 % min_hour_from)
@@ -307,6 +327,18 @@ class HrAttendanceDetail(models.Model):
                     attendance_obj.sudo().write({"is_abnormal": True})
             else:
                 attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
+
+            if checkin_time:
+                if checkin_time and checkin_type == "上班打卡" and not attendance_obj.check_in:
+                    attendance_obj.sudo().write({
+                        "check_in": checkin_time,
+                        "is_late_card": checkin_time > planning_slot_id.start_datetime,
+                    })
+                elif checkin_time and checkin_type == "下班打卡" and not attendance_obj.check_out:
+                    attendance_obj.sudo().write({
+                        "check_out": checkin_time,
+                        "is_early_card": planning_slot_id.end_datetime > checkin_time,
+                    })
             # 进行关联
             attendance_detail_obj.hr_attendance_id = attendance_obj.id
             return True

From f795e2db27d130858a33bedb982f9c3737c430aa Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Fri, 20 Dec 2024 11:07:53 +0800
Subject: [PATCH 12/13] =?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_wechat/models/hr_attendance_detail.py | 44 +++-----------------
 1 file changed, 6 insertions(+), 38 deletions(-)

diff --git a/yuthon_wechat/models/hr_attendance_detail.py b/yuthon_wechat/models/hr_attendance_detail.py
index f0e9a87c4..8116f6ef3 100644
--- a/yuthon_wechat/models/hr_attendance_detail.py
+++ b/yuthon_wechat/models/hr_attendance_detail.py
@@ -244,32 +244,12 @@ class HrAttendanceDetail(models.Model):
             if not attendance_obj:
                 res_user_obj = self.env['res.users'].search([("oauth_uid", "=", userid)], limit=1)
                 hr_employee_obj = self.env['hr.employee'].sudo().search([("user_id", "=", res_user_obj.id)], limit=1)
-                if not hr_employee_obj.default_planning_role_id:
-                    attendance_obj = self.env['hr.attendance'].sudo().create({
-                        'employee_id': hr_employee_obj.id,
-                        "userid": userid,
-                        "current_data": current_data,
-                        "attendance_type": "wx_work"
-                    })
-                else:
-                    if hr_employee_obj.default_planning_role_id.name == '保安部':
-                        current_datetime_start = datetime.datetime.combine(
-                            datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.min)
-                        current_datetime_end = datetime.datetime.combine(
-                            datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.max)
-                        planning_slot_id = self.env['planning.slot'].search(
-                            [('resource_id', '=', hr_employee_obj.resource_id.id),
-                             ('start_datetime', '>=', current_datetime_start),
-                             ('start_datetime', '<=', current_datetime_end)])
-                        if planning_slot_id:
-                            attendance_obj = self.env['hr.attendance'].sudo().create({
-                                'employee_id': hr_employee_obj.id,
-                                "userid": userid,
-                                "current_data": current_data,
-                                "shift_id": planning_slot_id.id,
-                                "attendance_type": "wx_work"
-                            })
-            planning_start_time = planning_slot_id.start_datetime
+                attendance_obj = self.env['hr.attendance'].sudo().create({
+                    'employee_id': hr_employee_obj.id,
+                    "userid": userid,
+                    "current_data": current_data,
+                    "attendance_type": "wx_work"
+                })
                      # 获取考勤日历的上班下班时间
             min_hour_from = self.env['resource.calendar'].search([])[0].attendance_ids[0].hour_from
             min_hour = int(min_hour_from)
@@ -327,18 +307,6 @@ class HrAttendanceDetail(models.Model):
                     attendance_obj.sudo().write({"is_abnormal": True})
             else:
                 attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
-
-            if checkin_time:
-                if checkin_time and checkin_type == "上班打卡" and not attendance_obj.check_in:
-                    attendance_obj.sudo().write({
-                        "check_in": checkin_time,
-                        "is_late_card": checkin_time > planning_slot_id.start_datetime,
-                    })
-                elif checkin_time and checkin_type == "下班打卡" and not attendance_obj.check_out:
-                    attendance_obj.sudo().write({
-                        "check_out": checkin_time,
-                        "is_early_card": planning_slot_id.end_datetime > checkin_time,
-                    })
             # 进行关联
             attendance_detail_obj.hr_attendance_id = attendance_obj.id
             return True

From dc1720a988c5d5bd1f0dbdbd1486c35bd0109675 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Fri, 20 Dec 2024 11:28:57 +0800
Subject: [PATCH 13/13] =?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_wechat/models/hr_attendance_detail.py | 166 ++++++++++++-------
 1 file changed, 104 insertions(+), 62 deletions(-)

diff --git a/yuthon_wechat/models/hr_attendance_detail.py b/yuthon_wechat/models/hr_attendance_detail.py
index 8116f6ef3..3079b82b3 100644
--- a/yuthon_wechat/models/hr_attendance_detail.py
+++ b/yuthon_wechat/models/hr_attendance_detail.py
@@ -244,69 +244,111 @@ class HrAttendanceDetail(models.Model):
             if not attendance_obj:
                 res_user_obj = self.env['res.users'].search([("oauth_uid", "=", userid)], limit=1)
                 hr_employee_obj = self.env['hr.employee'].sudo().search([("user_id", "=", res_user_obj.id)], limit=1)
-                attendance_obj = self.env['hr.attendance'].sudo().create({
-                    'employee_id': hr_employee_obj.id,
-                    "userid": userid,
-                    "current_data": current_data,
-                    "attendance_type": "wx_work"
-                })
-                     # 获取考勤日历的上班下班时间
-            min_hour_from = self.env['resource.calendar'].search([])[0].attendance_ids[0].hour_from
-            min_hour = int(min_hour_from)
-            min_minute = int(min_hour_from * 10 % min_hour_from)
-            max_hour_to = self.env['resource.calendar'].search([])[-1].attendance_ids[0].hour_to
-            max_hour = int(max_hour_to)
-            max_minute = int(max_hour_to * 10 % max_hour_to)
-            if attendance_obj.is_approval:
-                # 已经审批修复无需再次进行更新数据
-                return True
-            # 赋值企业微信打卡数据
-            attendance_obj.attendance_type = "wx_work"
-            checkin_type = data.get("checkin_type", "")
-            exception_type = data.get("exception_type", "")
-            will_datetime_start = checkin_time.replace(hour=min_hour, minute=min_minute)
-            will_datetime_end = checkin_time.replace(hour=max_hour, minute=max_minute)
-            if exception_type != "未打卡":
-                if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
-                    attendance_obj.sudo().write({
-                        "sch_check_in_time": sch_checkin_time,
-                        "check_in": checkin_time,
-                        "is_late_card": checkin_time > will_datetime_start,
+                if not hr_employee_obj.default_planning_role_id:
+                    attendance_obj = self.env['hr.attendance'].sudo().create({
+                        'employee_id': hr_employee_obj.id,
+                        "userid": userid,
+                        "current_data": current_data,
+                        "attendance_type": "wx_work"
                     })
-                elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
-                    attendance_obj.sudo().write({
-                        "sch_check_out_time": sch_checkin_time,
-                        "check_out": checkin_time,
-                        "is_early_card": will_datetime_end > checkin_time,
-                    })
-                elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
-                    attendance_obj.sudo().write({
-                        "sch_check_in_time": sch_checkin_time,
-                        "check_in": checkin_time,
-                        "is_late_card": checkin_time > will_datetime_start,
-                    })
-                elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
-                    attendance_obj.sudo().write({
-                        "sch_check_out_time": sch_checkin_time,
-                        "check_out": checkin_time,
-                        "is_early_card": will_datetime_end > checkin_time,
-                    })
-                elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
-                    attendance_obj.sudo().write({
-                        "sch_check_in_time": sch_checkin_time,
-                        "check_in": checkin_time,
-                        "is_late_card": checkin_time > will_datetime_start,
-                    })
-                elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
-                    attendance_obj.sudo().write({
-                        "sch_check_out_time": sch_checkin_time,
-                        "check_out": checkin_time,
-                        "is_early_card": will_datetime_end > checkin_time,
-                    })
-                elif attendance_obj.is_early_card or attendance_obj.is_late_card:
-                    attendance_obj.sudo().write({"is_abnormal": True})
-            else:
-                attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
+                else:
+                    if hr_employee_obj.default_planning_role_id.name == '保安部':
+                        current_datetime_start = datetime.datetime.combine(
+                            datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.min)
+                        current_datetime_end = datetime.datetime.combine(
+                            datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.max)
+                        planning_slot_id = self.env['planning.slot'].search(
+                            [('resource_id', '=', hr_employee_obj.resource_id.id),
+                             ('start_datetime', '>=', current_datetime_start),
+                             ('start_datetime', '<=', current_datetime_end)])
+                        if planning_slot_id:
+                            attendance_obj = self.env['hr.attendance'].sudo().create({
+                                'employee_id': hr_employee_obj.id,
+                                "userid": userid,
+                                "current_data": current_data,
+                                "shift_id": planning_slot_id.id,
+                                "attendance_type": "wx_work"
+                            })
+            if not hr_employee_obj.default_planning_role_id:
+                 # 获取考勤日历的上班下班时间
+                min_hour_from = self.env['resource.calendar'].search([])[0].attendance_ids[0].hour_from
+                min_hour = int(min_hour_from)
+                min_minute = int(min_hour_from * 10 % min_hour_from)
+                max_hour_to = self.env['resource.calendar'].search([])[-1].attendance_ids[0].hour_to
+                max_hour = int(max_hour_to)
+                max_minute = int(max_hour_to * 10 % max_hour_to)
+                if attendance_obj.is_approval:
+                    # 已经审批修复无需再次进行更新数据
+                    return True
+                # 赋值企业微信打卡数据
+                attendance_obj.attendance_type = "wx_work"
+                checkin_type = data.get("checkin_type", "")
+                exception_type = data.get("exception_type", "")
+                will_datetime_start = checkin_time.replace(hour=min_hour, minute=min_minute)
+                will_datetime_end = checkin_time.replace(hour=max_hour, minute=max_minute)
+                if exception_type != "未打卡":
+                    if checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and not attendance_obj.check_in:
+                        attendance_obj.sudo().write({
+                            "sch_check_in_time": sch_checkin_time,
+                            "check_in": checkin_time,
+                            "is_late_card": checkin_time > will_datetime_start,
+                        })
+                    elif checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and not attendance_obj.check_out:
+                        attendance_obj.sudo().write({
+                            "sch_check_out_time": sch_checkin_time,
+                            "check_out": checkin_time,
+                            "is_early_card": will_datetime_end > checkin_time,
+                        })
+                    elif attendance_obj.check_in and checkin_time and checkin_type == "上班打卡" and exception_type != "未打卡" and checkin_time < attendance_obj.check_in:
+                        attendance_obj.sudo().write({
+                            "sch_check_in_time": sch_checkin_time,
+                            "check_in": checkin_time,
+                            "is_late_card": checkin_time > will_datetime_start,
+                        })
+                    elif attendance_obj.check_out and checkin_time and checkin_type == "下班打卡" and exception_type != "未打卡" and checkin_time > attendance_obj.check_out:
+                        attendance_obj.sudo().write({
+                            "sch_check_out_time": sch_checkin_time,
+                            "check_out": checkin_time,
+                            "is_early_card": will_datetime_end > checkin_time,
+                        })
+                    elif checkin_time and exception_type != "未打卡" and not attendance_obj.check_in and not attendance_obj.check_out:
+                        attendance_obj.sudo().write({
+                            "sch_check_in_time": sch_checkin_time,
+                            "check_in": checkin_time,
+                            "is_late_card": checkin_time > will_datetime_start,
+                        })
+                    elif checkin_time and exception_type != "未打卡" and attendance_obj.check_in and not attendance_obj.check_out:
+                        attendance_obj.sudo().write({
+                            "sch_check_out_time": sch_checkin_time,
+                            "check_out": checkin_time,
+                            "is_early_card": will_datetime_end > checkin_time,
+                        })
+                    elif attendance_obj.is_early_card or attendance_obj.is_late_card:
+                        attendance_obj.sudo().write({"is_abnormal": True})
+                else:
+                    attendance_obj.sudo().write({"is_no_card": True, "is_abnormal": True})
+            elif hr_employee_obj.default_planning_role_id.name == '保安部':
+                attendance_obj.attendance_type = "wx_work"
+                checkin_type = data.get("checkin_type", "")
+                current_datetime_start = datetime.datetime.combine(datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.min)
+                current_datetime_end = datetime.datetime.combine(datetime.datetime.strptime(current_data, '%Y-%m-%d'), datetime.time.max)
+                planning_id = self.env['planning.slot'].search([('resource_id', '=', hr_employee_obj.resource_id.id),
+                                                                ('start_datetime', '>=', current_datetime_start),
+                                                                ('start_datetime', '<=', current_datetime_end)])
+                if planning_id:
+                    planning_start_time = planning_id.start_datetime
+                    planning_end_time = planning_id.end_datetime
+                    if checkin_time:
+                        if checkin_time and checkin_type == "上班打卡" and not attendance_obj.check_in:
+                            attendance_obj.sudo().write({
+                                "check_in": checkin_time,
+                                "is_late_card": checkin_time > planning_start_time
+                            })
+                        elif checkin_time and checkin_type == "下班打卡" and not attendance_obj.check_out:
+                            attendance_obj.sudo().write({
+                                "check_out": checkin_time,
+                                "is_early_card": planning_end_time> checkin_time,
+                            })
             # 进行关联
             attendance_detail_obj.hr_attendance_id = attendance_obj.id
             return True