Skip to content

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

修复

parent c26090c5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 25 deletions
app/service/report_service.py
View file @ ca86ab25
...@@ -34,42 +34,23 @@ def get_report_list(args): ...@@ -34,42 +34,23 @@ def get_report_list(args):
conditions = () conditions = ()
if type == 0: if type == 0:
conditions = [ conditions = [
and_(
ReportView.ifa_id == ifa_id, ReportView.ifa_id == ifa_id,
ReportView.name.like('%' + name + '%'), or_(ReportView.name.like('%' + name + '%'), ReportView.customer_name.like('%' + name + '%')),
ReportView.update_time >= start_time, ReportView.update_time >= start_time,
HoldReport.update_time <= end_time ReportView.update_time <= end_time
),
and_(
ReportView.ifa_id == ifa_id,
ReportView.customer_name.like('%' + name + '%'),
ReportView.update_time >= start_time,
HoldReport.update_time <= end_time
)
] ]
else: else:
conditions = [ conditions = [
and_(
ReportView.ifa_id == ifa_id, ReportView.ifa_id == ifa_id,
ReportView.type == type, ReportView.type == type,
ReportView.name.like('%' + name + '%'), or_(ReportView.name.like('%' + name + '%'), ReportView.customer_name.like('%' + name + '%')),
ReportView.update_time >= start_time, ReportView.update_time >= start_time,
HoldReport.update_time <= end_time ReportView.update_time <= end_time
),
and_(
ReportView.ifa_id == ifa_id,
ReportView.type == type,
ReportView.customer_name.like('%' + name + '%'),
ReportView.update_time >= start_time,
HoldReport.update_time <= end_time
)
] ]
allow_field = ['id', 'customer_id', 'ifa_id', 'update_time', 'update_status', 'file', 'be_viewed', 'name', 'customer_name', 'author_name', 'type'] allow_field = ['id', 'customer_id', 'ifa_id', 'update_time', 'update_status', 'file', 'be_viewed', 'name', 'customer_name', 'author_name', 'type']
with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app: with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
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(and_(*conditions))
*conditions
))
totalSize = report_res.count() totalSize = report_res.count()
report_res = report_res.offset(offset).limit(pageSize) 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]
...@@ -117,7 +98,7 @@ def get_one_report(args): ...@@ -117,7 +98,7 @@ def get_one_report(args):
res = tamp_diagnose_session.query(ReportView).filter(and_( res = tamp_diagnose_session.query(ReportView).filter(and_(
ReportView.id == id, ReportView.id == id,
ReportView.type == type, ReportView.type == type,
HoldReport.ifa_id == ifa_id, ReportView.ifa_id == ifa_id,
)) ))
data = [r.to_dict() for r in res] data = [r.to_dict() for r in res]
if data: if data:
......
logs/fund_report.log
View file @ ca86ab25
This diff is collapsed.
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