leguadmin/xbackend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修正报表排序

Browse Source
This commit is contained in:
wuaho 2021-10-11 14:58:27 +08:00
parent 6bd203997a
commit 1d96278818
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/api_v1/endpoints/report.py
View File

@ -86,8 +86,6 @@ async def read_report(
reports = await crud.report.read_report(db, project_id=data_in.project_id, reports = await crud.report.read_report(db, project_id=data_in.project_id,
projection=projection, **ext_where) projection=projection, **ext_where)
for item in reports: for item in reports:
item['added'] = False item['added'] = False
# item['name'] = item['name'] # item['name'] = item['name']
@ -96,7 +94,7 @@ async def read_report(
if item['_id'] in added_ids: if item['_id'] in added_ids:
item['added'] = True item['added'] = True
item['show_config'] = added_ids[item['_id']] item['show_config'] = added_ids[item['_id']]
reports = sorted(reports, key=lambda x: x.get('show_config', {}).get('sort',999) or 999) reports = sorted(reports, key=lambda x: x.get('show_config', {'sort': 999}).get('sort', 999))
return schemas.Msg(code=0, msg='ok', data=reports) return schemas.Msg(code=0, msg='ok', data=reports)