pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!3758 1

Browse Source 
Merge pull request !3758 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-07-10 09:21:09 +00:00
committed by Gitee
parent 2874eaae8a a94068557d
commit 53fc5dd46b
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/controllers/applet_attendance.py
+17 -18
View File
@@ -443,32 +443,31 @@ class AppletAttendance(Controller):
}
"""
_logger.info("----------------/yuthon/meter/reading---------接口收到响应-------------------------------")
electric_records = request.env(user=SUPERUSER_ID)['property.meter.archives'].search(
[('is_push', '=', 'True')])
water_records = request.env(user=SUPERUSER_ID)['property.meter.water'].search(
[('is_push', '=', 'True')])
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:
for electric in electric_records:
record_data = {
'code': record.name,
'last_dosage': record.last_dosage,
'current_meter': record.current_meter,
'dosage': record.dosage,
'employee_name': record.employee_ids[0].name if record.employee_ids else '',
'code': electric.name,
'employee_name': 'xxx,xxx',
'address': '地址address',
'mater_data': '抄表日期str',
'last_mater_data': '上次抄表日期',
'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.code,
'last_dosage': record.last_dosage,
'current_meter': record.current_meter,
'dosage': record.dosage,
'employee_list': record.employee_ids[0].name if record.employee_ids else '',
'meter_type': 'water',
'code': water.name,
'employee_name': 'xxx,xxx',
'address': '地址address',
'mater_data': '抄表日期str',
'last_mater_data': '上次抄表日期',
'last_dosage': water.last_dosage,
'meter_type': 'water', # 添加仪表类型
}
result_list.append(record_data)
return_data = {