Skip to content

F
fund_report
Commit e3fdda99 authored by wang zhengwei's avatar wang zhengwei
Browse files
Options

fix bug

parent 976dd762
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 13 deletions
app/service/report_service.py
View file @ e3fdda99
......@@ -34,6 +34,7 @@ def get_report_list(args):
totalSize = 0
conditions = ()
if type == 0:
if start_time and end_time:
conditions = [
ReportView.ifa_id == ifa_id,
or_(ReportView.name.like('%' + name + '%'), ReportView.customer_name.like('%' + name + '%')),
......@@ -41,6 +42,12 @@ def get_report_list(args):
ReportView.create_time <= end_time
]
else:
conditions = [
ReportView.ifa_id == ifa_id,
or_(ReportView.name.like('%' + name + '%'), ReportView.customer_name.like('%' + name + '%'))
]
else:
if start_time and end_time:
conditions = [
ReportView.ifa_id == ifa_id,
ReportView.type == type,
......@@ -48,6 +55,12 @@ def get_report_list(args):
ReportView.create_time >= start_time,
ReportView.create_time <= end_time
]
else:
conditions = [
ReportView.ifa_id == ifa_id,
ReportView.type == type,
or_(ReportView.name.like('%' + name + '%'), ReportView.customer_name.like('%' + name + '%'))
]
allow_field = ['id', 'customer_id', 'ifa_id', 'update_time', 'create_time', 'update_status', 'file', 'be_viewed', 'name', 'customer_name', 'author_name', 'type']
with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
tamp_diagnose_session = tamp_diagnose_app.session
......
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