diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 59d835cdf..1892861f1 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -891,12 +891,12 @@ class AppletAttendance(Controller): # 去掉 数据为 0 的数据. electric_records = request.env(user=SUPERUSER_ID)['meter.archives.line'].search([ ('archives_state', '!=', 'stop'), - ('is_virtual_meter', '!=', True), + ('archives_id.is_virtual_meter', '!=', True), ('meter_date', '>=', first_day_str), ('meter_date', '<=', last_day_str), '|', - ('end_time', '=', False), - ('end_time', '<=', two_months_ago) + ('archives_id.end_time', '=', False), + ('archives_id.end_time', '<=', two_months_ago) ]) water_records = request.env(user=SUPERUSER_ID)['meter.water.line'].search([ @@ -904,8 +904,8 @@ class AppletAttendance(Controller): ('meter_date', '>=', first_day_str), ('meter_date', '<=', last_day_str), '|', - ('end_time', '=', False), - ('end_time', '<=', two_months_ago) + ('water_id.end_time', '=', False), + ('water_id.end_time', '<=', two_months_ago) ]) # 接口调整, 电表,水表数据拆分.