Skip to content

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

修复

parent c26090c5
Show 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):
conditions = ()
if type == 0:
conditions = [
and_(
ReportView.ifa_id == ifa_id,
ReportView.name.like('%' + name + '%'),
or_(ReportView.name.like('%' + name + '%'), ReportView.customer_name.like('%' + name + '%')),
ReportView.update_time >= start_time,
HoldReport.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
)
ReportView.update_time <= end_time
]
else:
conditions = [
and_(
ReportView.ifa_id == ifa_id,
ReportView.type == type,
ReportView.name.like('%' + name + '%'),
ReportView.update_time >= start_time,
HoldReport.update_time <= end_time
),
and_(
ReportView.ifa_id == ifa_id,
ReportView.type == type,
ReportView.customer_name.like('%' + name + '%'),
or_(ReportView.name.like('%' + name + '%'), ReportView.customer_name.like('%' + name + '%')),
ReportView.update_time >= start_time,
HoldReport.update_time <= end_time
)
ReportView.update_time <= end_time
]
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:
tamp_diagnose_session = tamp_diagnose_app.session
report_res = tamp_diagnose_session.query(ReportView).filter(or_(
*conditions
))
report_res = tamp_diagnose_session.query(ReportView).filter(and_(*conditions))
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]
......@@ -117,7 +98,7 @@ def get_one_report(args):
res = tamp_diagnose_session.query(ReportView).filter(and_(
ReportView.id == id,
ReportView.type == type,
HoldReport.ifa_id == ifa_id,
ReportView.ifa_id == ifa_id,
))
data = [r.to_dict() for r in res]
if data:
......
logs/fund_report.log
View file @ ca86ab25
......@@ -10857,3 +10857,83 @@ MySQLdb._exceptions.OperationalError: (2013, 'Lost connection to MySQL server du
2021-01-18 10:29:53 Mon werkzeug INFO * Debugger PIN: 191-123-093
2021-01-18 11:16:22 Mon werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/utils/draw.py', reloading
2021-01-18 11:16:23 Mon werkzeug INFO * Restarting with stat
2021-01-20 17:03:29 Wed werkzeug INFO * Running on http://0.0.0.0:8000/ (Press CTRL+C to quit)
2021-01-20 17:03:29 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:03:40 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:03:40 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:05:33 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:05:33] "POST /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:05:40 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:05:40] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:06:22 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:06:22] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:06:27 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:06:27] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:06:48 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:06:48 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:07:11 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:07:11 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:07:12 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:07:12] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:07:35 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:07:36 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:07:48 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:07:48 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:08:28 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:08:28] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:08:38 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:08:39 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:08:51 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:08:51 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:08:52 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:08:52] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:09:04 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:09:05 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:09:17 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:09:17 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:12:15 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:12:15 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:12:29 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:12:29 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:12:37 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:12:37 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:12:50 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:12:50 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:12:51 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:12:51] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:13:01 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:13:01] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:15:40 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:15:41 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:15:55 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:15:55 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:15:55 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:15:55] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:15:59 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:15:59] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:16:46 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:16:46 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:16:58 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:16:58 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:16:58 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:16:58] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:17:30 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:17:30 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:17:43 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:17:43 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:17:44 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:17:44] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:18:56 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:18:56 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:19:10 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:19:10 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:19:11 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:19:11] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:19:17 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:19:17] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:19:31 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:19:31] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:19:46 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:19:46 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:20:02 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:20:02 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:20:03 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:20:03] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:21:11 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:21:11 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:21:25 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:21:25 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:21:26 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:21:26] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:22:15 Wed werkzeug INFO * Detected change in '/Users/pengxiong/Desktop/tamp_workspace/fund_report/app/service/report_service.py', reloading
2021-01-20 17:22:16 Wed werkzeug INFO * Restarting with stat
2021-01-20 17:22:39 Wed werkzeug WARNING * Debugger is active!
2021-01-20 17:22:39 Wed werkzeug INFO * Debugger PIN: 191-123-093
2021-01-20 17:22:40 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:22:40] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:22:45 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:22:45] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:23:05 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:23:05] "GET /api/fund_report/reportlist?type=0&name=2&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:23:32 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:23:32] "GET /api/fund_report/reportlist?type=0&name=111&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
2021-01-20 17:23:38 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:23:38] "GET /api/fund_report/reportlist?type=王&name=111&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 400 -
2021-01-20 17:23:50 Wed werkzeug INFO 127.0.0.1 - - [20/Jan/2021 17:23:50] "GET /api/fund_report/reportlist?type=0&name=王&start_time=1970-01-01+00:00:00&end_time=2021-01-20+23:59:59&pageNumber=1&pageSize=10 HTTP/1.1" 200 -
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