From ef0591bba3fdc326348eb4e45a61d14d20dc7370 Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Fri, 17 Oct 2025 09:23:21 +0800 Subject: [PATCH] 1 --- yuthon_hr_attendance/controllers/applet_attendance.py | 5 +++++ yuthon_hr_attendance/models/hr_attendance_detail_wechat.py | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 4db0afd06..16ab78f59 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -166,6 +166,11 @@ class AppletAttendance(Controller): for mac in wifi_mac.wifi_name_ids: wifi_name_list.append(mac.mac) for address_id in address_ids: + if '天成大厦' in self_address['formatted_address']: + message = '可以打卡' + state = 'yes' + _logger.info(f"天成大厦在{self_address['formatted_address']}") + break card_rice = address_id.card_rice * 0.001 # 打卡范围 if self.is_within_radius_geopy(kw['att_latitude'], kw['att_longitude'], address_id.latitude, address_id.longitude, card_rice) or kw['wifi_name'] in wifi_name_list: diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py index 55f4d58a0..bb5b1d49a 100644 --- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py +++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py @@ -135,8 +135,8 @@ class HrAttendanceDetail(models.Model): for checkin in monthly_checkins: checkin_date = fields.Date.from_string(checkin.checkin_time) unique_dates.add(checkin_date) - current_date_exists = current_date in unique_dates - actual_days = len(unique_dates) + 1 if not current_date_exists else len(unique_dates) + # current_date_exists = current_date in unique_dates + # actual_days = len(unique_dates) + 1 if not current_date_exists else len(unique_dates) # if vacation_report: # vacation_report.actual_attendance = actual_days # vacation_report.should_attendance = days