!7248 !7247 添加功能

Merge pull request !7248 from 李鹏宇/dev

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)
         ])
 
         # 接口调整, 电表,水表数据拆分.