From d08cc6f1889a83878bd51caab32371ab71bd4c91 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:18:06 +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 --- .../controllers/applet_attendance.py | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 1892861f1..2056e7b68 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -889,23 +889,29 @@ class AppletAttendance(Controller): last_day_str = last_day.strftime('%Y-%m-%d') two_months_ago = datetime.now().date() - relativedelta(months=2) # 去掉 数据为 0 的数据. + valid_archives_ids = request.env(user=SUPERUSER_ID)['property.meter.archives'].search([ + ('is_virtual_meter', '!=', True), + '|', + ('end_time', '=', False), + ('end_time', '<=', two_months_ago) + ]).ids electric_records = request.env(user=SUPERUSER_ID)['meter.archives.line'].search([ ('archives_state', '!=', 'stop'), - ('archives_id.is_virtual_meter', '!=', True), + ('archives_id', 'in', valid_archives_ids), ('meter_date', '>=', first_day_str), ('meter_date', '<=', last_day_str), - '|', - ('archives_id.end_time', '=', False), - ('archives_id.end_time', '<=', two_months_ago) ]) + valid_water_ids = request.env(user=SUPERUSER_ID)['property.meter.water'].search([ + '|', + ('end_time', '=', False), + ('end_time', '<=', two_months_ago) + ]).ids water_records = request.env(user=SUPERUSER_ID)['meter.water.line'].search([ ('water_state', '!=', 'stop'), ('meter_date', '>=', first_day_str), ('meter_date', '<=', last_day_str), - '|', - ('water_id.end_time', '=', False), - ('water_id.end_time', '<=', two_months_ago) + ('water_id', 'in', valid_water_ids) ]) # 接口调整, 电表,水表数据拆分.