!4559 !4558 添加功能

Merge pull request !4559 from 李鹏宇/dev

yuthon_hr_attendance/controllers/applet_attendance.py

@@ -75,8 +75,8 @@ class AppletAttendance(Controller):
             [('employee_id', '=', employee_id.id), ('current_data', '=', current_date)])
         check_in = attendance_id.check_in + timedelta(hours=8) if attendance_id.check_in else ''
         check_out = attendance_id.check_out + timedelta(hours=8) if attendance_id.check_out else ''
-        start_time_str = '09:00'
-        end_time_str = '18:00'
+        start_time_str = ''
+        end_time_str = ''
         if attendance_id:
             if not attendance_id.shift_id:
                 year = attendance_id.current_data.year
@@ -138,10 +138,10 @@ class AppletAttendance(Controller):
                 state = 'yes'
                 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']}_________")
-        shift_info = attendance_id.shift_name if attendance_id else (
-            "行政班次" if self.is_workday(current_date) else "")
-        time_part = f"{start_time_str}-{end_time_str}" if self.is_workday(current_date) else "休息"
-        attendance_id_class = f"{shift_info}{time_part}" if shift_info else time_part
+        if self.is_workday(current_date):
+            attendance_id_class = f"{attendance_id.shift_name}  {start_time_str}-{end_time_str}"
+        else:
+            attendance_id_class = f"{attendance_id.shift_name}休息"
         data = {
             'location': self_address['formatted_address'],
             'user_id': user_id.id,