diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index c0ee18bdc..b145c0f8a 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -77,6 +77,10 @@ class AppletAttendance(Controller): check_out = attendance_id.check_out + timedelta(hours=8) if attendance_id.check_out else '' start_time_str = '' end_time_str = '' + if attendance_id.shift_name: + shift_name = attendance_id.shift_name + else: + shift_name = '行政班次' if attendance_id: if not attendance_id.shift_id: year = attendance_id.current_data.year @@ -139,9 +143,9 @@ class AppletAttendance(Controller): break _logger.info(f"\n人员: {employee_id.name} {employee_id.company_id.name} \n当前所在地址: {self_address['formatted_address']} \n是否可以打卡: {state}\n {wifi_name_list}\n wifi:{kw['wifi_name']}_________") if self.is_workday(current_date): - attendance_id_class = f"{attendance_id.shift_name} {start_time_str}-{end_time_str}" + attendance_id_class = f"{shift_name} {start_time_str}-{end_time_str}" else: - attendance_id_class = f"{attendance_id.shift_name}休息" + attendance_id_class = f"{shift_name}休息" data = { 'location': self_address['formatted_address'], 'user_id': user_id.id,