1
This commit is contained in:
@@ -630,8 +630,8 @@ class AppletAttendance(Controller):
|
||||
# 表具基础信息
|
||||
'code': electric.name,
|
||||
'last_dosage': electric.last_dosage,
|
||||
'mater_data': electric.meter_date,
|
||||
'last_mater_data': electric.last_meter,
|
||||
'mater_data': str(electric.meter_date) if electric.meter_date else ' ',
|
||||
'last_mater_data': str(electric.last_meter) if electric.last_meter else ' ',
|
||||
'meter_type': 'electric',
|
||||
'employee_name': property_info.lessee_id.name,
|
||||
'address': property_info.name,
|
||||
@@ -646,8 +646,8 @@ class AppletAttendance(Controller):
|
||||
all_records.append({
|
||||
'code': water.name,
|
||||
'last_dosage': water.last_dosage,
|
||||
'mater_data': water.meter_date,
|
||||
'last_mater_data': water.last_meter,
|
||||
'mater_data': str(water.meter_date) if water.meter_date else ' ',
|
||||
'last_mater_data': str(water.last_meter) if water.last_meter else ' ',
|
||||
'meter_type': 'water',
|
||||
'employee_name': property_info.lessee_id.name,
|
||||
'address': property_info.name,
|
||||
|
||||
Reference in New Issue
Block a user