From d05f95803cae95a57b96ed59c54480d7be0f25f3 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Thu, 14 Aug 2025 09:42:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_attendance/models/hr_attendance.py | 4 ++-- yuthon_hr_attendance/models/hr_attendance_detail_wechat.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py index c58649264..74eb2930e 100644 --- a/yuthon_hr_attendance/models/hr_attendance.py +++ b/yuthon_hr_attendance/models/hr_attendance.py @@ -115,8 +115,8 @@ class HrAttendance(models.Model): if 'check_out' in vals: for record in self: target_date = record.current_data - start_of_day = datetime.combine(target_date, datetime.min.time()) - end_of_day = start_of_day + timedelta(days=1) + start_of_day = datetime.combine(target_date, datetime.min.time()) + timedelta(hours=8) + end_of_day = start_of_day + timedelta(days=1) + timedelta(hours=8) start_str = fields.Datetime.to_string(start_of_day) end_str = fields.Datetime.to_string(end_of_day) detail_records = self.env['hr.attendance.detail'].search([ diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py index f0149f2e0..8cfc4a987 100644 --- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py +++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py @@ -113,7 +113,7 @@ class HrAttendanceDetail(models.Model): """同步打卡记录到hr.attendance 更新上下班打卡时间 """ checkin_date = fields.Date.from_string(record.checkin_time) attendance = self.env['hr.attendance'].search([ - ('employee_id.name', '=', '叶华锋'), + ('employee_id', '=', record.employee_id.id), ('current_data', '=', checkin_date) ], limit=1) if attendance: From ee2587bbe35b72bec73e8c8b0487e9c8920208df Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Thu, 14 Aug 2025 09:43:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_attendance/models/hr_attendance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py index 74eb2930e..87a0b9ee0 100644 --- a/yuthon_hr_attendance/models/hr_attendance.py +++ b/yuthon_hr_attendance/models/hr_attendance.py @@ -115,8 +115,8 @@ class HrAttendance(models.Model): if 'check_out' in vals: for record in self: target_date = record.current_data - start_of_day = datetime.combine(target_date, datetime.min.time()) + timedelta(hours=8) - end_of_day = start_of_day + timedelta(days=1) + timedelta(hours=8) + start_of_day = datetime.combine(target_date, datetime.min.time()) - timedelta(hours=8) + end_of_day = start_of_day + timedelta(days=1) - timedelta(hours=8) start_str = fields.Datetime.to_string(start_of_day) end_str = fields.Datetime.to_string(end_of_day) detail_records = self.env['hr.attendance.detail'].search([