From 3a352888866872cb00f67f15c859a532378b310b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Thu, 25 Dec 2025 11:04:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_attendance/controllers/applet_attendance.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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) ]) # 接口调整, 电表,水表数据拆分.