Skip to content

F
fund_report
Commit c26090c5 authored by pengxiong's avatar pengxiong
Browse files
Options

fix2

parent b85484cd
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
app/service/report_service.py
View file @ c26090c5
...@@ -30,6 +30,7 @@ def get_report_list(args): ...@@ -30,6 +30,7 @@ def get_report_list(args):
end_time = args.get('end_time') end_time = args.get('end_time')
offset = (pageNumber - 1) * pageSize offset = (pageNumber - 1) * pageSize
res = [] res = []
totalSize = 0
conditions = () conditions = ()
if type == 0: if type == 0:
conditions = [ conditions = [
...@@ -68,9 +69,11 @@ def get_report_list(args): ...@@ -68,9 +69,11 @@ def get_report_list(args):
tamp_diagnose_session = tamp_diagnose_app.session tamp_diagnose_session = tamp_diagnose_app.session
report_res = tamp_diagnose_session.query(ReportView).filter(or_( report_res = tamp_diagnose_session.query(ReportView).filter(or_(
*conditions *conditions
)).offset(offset).limit(pageSize) ))
totalSize = report_res.count()
report_res = report_res.offset(offset).limit(pageSize)
res = [r.to_dict(allow_field=allow_field) for r in report_res] res = [r.to_dict(allow_field=allow_field) for r in report_res]
totalSize = res.count()
return { return {
'content': res, 'content': res,
'pageNum': pageNumber, 'pageNum': pageNumber,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment