Skip to content

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

万元去掉

parent f3dabf25
Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 7 deletions
app/templates/v2/monthReportV2.html
View file @ 06079d37
...@@ -1559,12 +1559,12 @@ ...@@ -1559,12 +1559,12 @@
<th>基金简称</th> <th>基金简称</th>
<th>买入时间</th> <th>买入时间</th>
<th>存续年数</th> <th>存续年数</th>
<th>投资本金 (万元)</th> <th>投资本金 (万)</th>
<th>当月收益 (万元)</th> <th>当月收益 (万)</th>
<th>当月收益率 (%)</th> <th>当月收益率 (%)</th>
<th>月末市值 (万元)</th> <th>月末市值 (万)</th>
<th>月末占比 (%)</th> <th>月末占比 (%)</th>
<th>累计收益 (万元)</th> <th>累计收益 (万)</th>
<th>累计收益率 (%)</th> <th>累计收益率 (%)</th>
<th>年化收益率 (%)</th> <th>年化收益率 (%)</th>
</tr> </tr>
......
app/utils/jinjia2html.py
View file @ 06079d37
...@@ -254,8 +254,15 @@ class DataIntegrate: ...@@ -254,8 +254,15 @@ class DataIntegrate:
# 'suggestions_result': self.suggestions_result, # 'suggestions_result': self.suggestions_result,
# 'suggestions_result_asset': self.suggestions_result_asset, # 'suggestions_result_asset': self.suggestions_result_asset,
# 'return_compare_pic': self.return_compare_pic, # 'return_compare_pic': self.return_compare_pic,
'indicator_compare': self.indicator_compare, # 'indicator_compare': self.indicator_compare,
# 'new_group_evaluation': self.new_group_evaluation # 'new_group_evaluation': self.new_group_evaluation
'new_correlation': [],
'propose_fund_data_list': [],
'suggestions_result': {},
'suggestions_result_asset': {},
'return_compare_pic': [],
'indicator_compare': [],
'new_group_evaluation': []
} }
# 开始渲染html模板 # 开始渲染html模板
......
app/utils/timed_task.py
View file @ 06079d37
...@@ -54,8 +54,8 @@ with TAMP_SQL(tamp_user_engine) as tamp_user, TAMP_SQL(tamp_order_engine) as tam ...@@ -54,8 +54,8 @@ with TAMP_SQL(tamp_user_engine) as tamp_user, TAMP_SQL(tamp_order_engine) as tam
for ifauser in ifausers: for ifauser in ifausers:
# 获取某个 ifa 的所有 customer # 获取某个 ifa 的所有 customer
customers = tamp_order_session.query(Ifa_Customer).\ customers = tamp_order_session.query(Ifa_Customer).\
filter(and_(Ifa_Customer.ifa_id == ifauser.id, Ifa_Customer.customer_id.in_(['6716613804182482944', '6716613804966817792']))).all() filter(and_(Ifa_Customer.ifa_id == ifauser.id, Ifa_Customer.customer_id.in_(['6716613804182482944']))).all()
# 循环这个 ifa 的所有 customer # 循环这个 ifa 的所有 customer
for customer in customers: for customer in customers:
customer_full = tamp_order_session.query(Customer).\ customer_full = tamp_order_session.query(Customer).\
......
logs/tamp_course_order.log
View file @ 06079d37
...@@ -168655,3 +168655,157 @@ FROM customer ...@@ -168655,3 +168655,157 @@ FROM customer
WHERE customer.id = %(param_1)s WHERE customer.id = %(param_1)s
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'} 2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 19:39:28 Wed sqlalchemy.engine.base.Engine INFO COMMIT 2020-12-09 19:39:28 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test collated returns' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin AS anon_1
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO SELECT ifa_customer.id AS ifa_customer_id, ifa_customer.customer_id AS ifa_customer_customer_id, ifa_customer.ifa_id AS ifa_customer_ifa_id
FROM ifa_customer
WHERE ifa_customer.ifa_id = %(ifa_id_1)s AND ifa_customer.customer_id IN (%(customer_id_1)s, %(customer_id_2)s)
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944', 'customer_id_2': '6716613804966817792'}
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO SELECT customer.id AS customer_id, customer.customer_name AS customer_customer_name
FROM customer
WHERE customer.id = %(param_1)s
2020-12-09 20:07:45 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 20:08:07 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test collated returns' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin AS anon_1
2020-12-09 20:08:37 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:08:38 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 20:08:38 Wed sqlalchemy.engine.base.Engine INFO SELECT ifa_customer.id AS ifa_customer_id, ifa_customer.customer_id AS ifa_customer_customer_id, ifa_customer.ifa_id AS ifa_customer_ifa_id
FROM ifa_customer
WHERE ifa_customer.ifa_id = %(ifa_id_1)s AND ifa_customer.customer_id IN (%(customer_id_1)s, %(customer_id_2)s)
2020-12-09 20:08:38 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944', 'customer_id_2': '6716613804966817792'}
2020-12-09 20:08:38 Wed sqlalchemy.engine.base.Engine INFO SELECT customer.id AS customer_id, customer.customer_name AS customer_customer_name
FROM customer
WHERE customer.id = %(param_1)s
2020-12-09 20:08:38 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 20:09:01 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test collated returns' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin AS anon_1
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO SELECT ifa_customer.id AS ifa_customer_id, ifa_customer.customer_id AS ifa_customer_customer_id, ifa_customer.ifa_id AS ifa_customer_ifa_id
FROM ifa_customer
WHERE ifa_customer.ifa_id = %(ifa_id_1)s AND ifa_customer.customer_id IN (%(customer_id_1)s, %(customer_id_2)s)
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944', 'customer_id_2': '6716613804966817792'}
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO SELECT customer.id AS customer_id, customer.customer_name AS customer_customer_name
FROM customer
WHERE customer.id = %(param_1)s
2020-12-09 20:12:44 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 20:13:03 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test collated returns' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin AS anon_1
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO SELECT ifa_customer.id AS ifa_customer_id, ifa_customer.customer_id AS ifa_customer_customer_id, ifa_customer.ifa_id AS ifa_customer_ifa_id
FROM ifa_customer
WHERE ifa_customer.ifa_id = %(ifa_id_1)s AND ifa_customer.customer_id IN (%(customer_id_1)s, %(customer_id_2)s)
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944', 'customer_id_2': '6716613804966817792'}
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO SELECT customer.id AS customer_id, customer.customer_name AS customer_customer_name
FROM customer
WHERE customer.id = %(param_1)s
2020-12-09 20:13:30 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 20:13:54 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test collated returns' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin AS anon_1
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO SELECT ifa_customer.id AS ifa_customer_id, ifa_customer.customer_id AS ifa_customer_customer_id, ifa_customer.ifa_id AS ifa_customer_ifa_id
FROM ifa_customer
WHERE ifa_customer.ifa_id = %(ifa_id_1)s AND ifa_customer.customer_id IN (%(customer_id_1)s)
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804966817792'}
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO SELECT customer.id AS customer_id, customer.customer_name AS customer_customer_name
FROM customer
WHERE customer.id = %(param_1)s
2020-12-09 20:16:30 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 20:16:54 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test collated returns' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin AS anon_1
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO SELECT ifa_customer.id AS ifa_customer_id, ifa_customer.customer_id AS ifa_customer_customer_id, ifa_customer.ifa_id AS ifa_customer_ifa_id
FROM ifa_customer
WHERE ifa_customer.ifa_id = %(ifa_id_1)s AND ifa_customer.customer_id IN (%(customer_id_1)s)
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804966817792'}
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO SELECT customer.id AS customer_id, customer.customer_name AS customer_customer_name
FROM customer
WHERE customer.id = %(param_1)s
2020-12-09 20:17:24 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 20:17:58 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 20:19:05 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 20:19:05 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:19:05 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 20:19:05 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:19:05 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 20:19:05 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:19:05 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 20:19:05 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:19:05 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 20:19:05 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:19:06 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test collated returns' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin AS anon_1
2020-12-09 20:19:06 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 20:19:06 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 20:19:06 Wed sqlalchemy.engine.base.Engine INFO SELECT ifa_customer.id AS ifa_customer_id, ifa_customer.customer_id AS ifa_customer_customer_id, ifa_customer.ifa_id AS ifa_customer_ifa_id
FROM ifa_customer
WHERE ifa_customer.ifa_id = %(ifa_id_1)s AND ifa_customer.customer_id IN (%(customer_id_1)s)
2020-12-09 20:19:06 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944'}
2020-12-09 20:19:06 Wed sqlalchemy.engine.base.Engine INFO SELECT customer.id AS customer_id, customer.customer_name AS customer_customer_name
FROM customer
WHERE customer.id = %(param_1)s
2020-12-09 20:19:06 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804182482944'}
2020-12-09 20:19:10 Wed sqlalchemy.engine.base.Engine INFO COMMIT
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