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

!6626 !6625 添加功能

Browse Source 
Merge pull request !6626 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-11-21 12:54:58 +00:00
committed by Gitee
parent d3a9a21384 19cc200a7c
commit e70165d2be
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
+6 -9
View File
@@ -174,17 +174,14 @@ class HrAttendanceDetail(models.Model):
checkin_times = [rec.checkin_time + timedelta(hours=8) for rec in attendance_records if rec.checkin_time]
# 3. 确定有效上下班时间
check_in_end = self.float_to_datetime(current_data, template.check_in_end)
check_in_start = self.float_to_datetime(current_data, template.check_in_start)
if template.check_in_start > template.check_in_end:
valid_checkins = [
t for t in checkin_times
if check_in_end <= t <= check_in_start
]
check_in_start = self.float_to_datetime(current_data, template.check_in_start) - relativedelta(days=1)
else:
valid_checkins = [
t for t in checkin_times
if check_in_start <= t <= check_in_end
]
check_in_start = self.float_to_datetime(current_data, template.check_in_start)
valid_checkins = [
t for t in checkin_times
if check_in_start <= t <= check_in_end
]
# 上班时间：在上班范围内的最小打卡时间
check_in_time = min(valid_checkins) - timedelta(hours=8) if valid_checkins else None
check_out_start = self.float_to_datetime(current_data, template.check_out_start)