From 444b3c530a3feec720230ad12e78f70a40605923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 10 Jul 2025 17:12:25 +0800 Subject: [PATCH 1/2] 1 --- .../controllers/applet_attendance.py | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 6ab081eec..90de96cf2 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -353,7 +353,7 @@ class AppletAttendance(Controller): # 添加到记录列表 records.append({ 'date': att.current_data.strftime('%Y-%m-%d'), - 'class': [f"{att.shift_name}",f"{standard_check_in_str}-{standard_check_out_str}"], + 'class': [f"{att.shift_name}", f"{standard_check_in_str}-{standard_check_out_str}"], 'user_id': user_id, 'check_in': check_in_str, 'check_out': check_out_str, @@ -444,32 +444,31 @@ class AppletAttendance(Controller): } """ _logger.info("----------------/yuthon/meter/reading---------接口收到响应-------------------------------") - electric_records = request.env(user=SUPERUSER_ID)['property.electric.reading'].search( - [('reading_state', '=', 'wait')]) - water_records = request.env(user=SUPERUSER_ID)['property.water.reading'].search( - [('reading_state', '=', 'wait')]) + electric_records = request.env(user=SUPERUSER_ID)['property.meter.archives'].search([]) + water_records = request.env(user=SUPERUSER_ID)['property.meter.water'].search([]) result_list = [] # 处理电表记录 for record in electric_records: record_data = { - 'code': record.code, + 'code': record.name, + 'employee_name': 'xxx,xxx', + 'address': '地址address', + 'mater_data': '抄表日期str', + 'last_mater_data': '上次抄表日期', 'last_dosage': record.last_dosage, - 'current_meter': record.current_meter, - 'dosage': record.dosage, - 'employee_name': record.employee_ids[0].name, 'meter_type': 'electric', # 添加仪表类型 - } result_list.append(record_data) # 处理水表记录 for record in water_records: record_data = { - 'code': record.code, + 'code': record.name, + 'employee_name': 'xxx,xxx', + 'address': '地址address', + 'mater_data': '抄表日期str', + 'last_mater_data': '上次抄表日期', 'last_dosage': record.last_dosage, - 'current_meter': record.current_meter, - 'dosage': record.dosage, - 'employee_list': record.employee_ids[0].name, - 'meter_type': 'water', + 'meter_type': 'water', # 添加仪表类型 } result_list.append(record_data) return_data = { From 6499cece1e3297719a79698b5bd74af2c87e8308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 10 Jul 2025 17:13:28 +0800 Subject: [PATCH 2/2] 1 --- .../controllers/applet_attendance.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 90de96cf2..c94f1b275 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -448,26 +448,26 @@ class AppletAttendance(Controller): water_records = request.env(user=SUPERUSER_ID)['property.meter.water'].search([]) result_list = [] # 处理电表记录 - for record in electric_records: + for electric in electric_records: record_data = { - 'code': record.name, + 'code': electric.name, 'employee_name': 'xxx,xxx', 'address': '地址address', 'mater_data': '抄表日期str', 'last_mater_data': '上次抄表日期', - 'last_dosage': record.last_dosage, + 'last_dosage': electric.last_dosage, 'meter_type': 'electric', # 添加仪表类型 } result_list.append(record_data) # 处理水表记录 - for record in water_records: + for water in water_records: record_data = { - 'code': record.name, + 'code': water.name, 'employee_name': 'xxx,xxx', 'address': '地址address', 'mater_data': '抄表日期str', 'last_mater_data': '上次抄表日期', - 'last_dosage': record.last_dosage, + 'last_dosage': water.last_dosage, 'meter_type': 'water', # 添加仪表类型 } result_list.append(record_data)