Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang
This commit is contained in:
@@ -1161,8 +1161,12 @@ class AppletAttendance(Controller):
|
||||
'current_read': clean_floats(record.current_read),
|
||||
'current_meter': clean_floats(record.current_meter)
|
||||
}
|
||||
if record.archives_id.name not in code_list:
|
||||
code_list.append(record.archives_id.name)
|
||||
if type == 'water':
|
||||
current_name = record.water_id.name if record.water_id else ''
|
||||
else:
|
||||
current_name = record.archives_id.name if record.archives_id else ''
|
||||
if current_name and current_name not in code_list:
|
||||
code_list.append(current_name)
|
||||
result.append(tvalue)
|
||||
return json.dumps(result, allow_nan=False)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user