pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!8908 !8907 添加功能

Browse Source 
Merge pull request !8908 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-02-13 02:48:40 +00:00
committed by Gitee
parent 624bef0f13 4af5f650d8
commit 4de3801547
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/hr_attendance.py
+4 -3
View File
@@ -676,7 +676,7 @@ class HrAttendance(models.Model):
next_day = current_date + timedelta(days=1)
start_datetime = datetime.combine(current_date, datetime.min.time()) - timedelta(hours=8)
check_out_end = self.float_to_datetime(current_date, template.check_out_end)
if template.day2 == '次日':
if template.check_out_end < template.check_out_start:
check_out_end = self.float_to_datetime(next_day, template.check_out_end)
domain = [
('employee_id', '=', employee_id.id),
@@ -1297,9 +1297,10 @@ class HrAttendance(models.Model):
go_approval_domain = [
('employee_ids', 'in', employee.id),
('start_date', '<=', current_date_str),
('end_date', '>=', current_date_str)
('end_date', '>=', current_date_str),
('work_end', '=', True),
]
go_approval_record = self.env['go.approval'].search(go_approval_domain)
go_approval_record = self.env['go.approval'].search(go_approval_domain, limit=1)
if go_approval_record:
workflow = self.env['soong.workflow.record'].search([
('code', '=', go_approval_record.code)