Commit 0cc22f1d authored by pengxiong's avatar pengxiong

分离

parent 2e845ab1
......@@ -37,20 +37,20 @@ class DataIntegrate:
self.comments_on_position_portfolio()
# 贡献分解
self.contribution_deco()
# 目标与业绩
self.objectives_performance(self.group_result)
# 个基点评
self.single_fund_comment()
# 旧收益比较
self.get_old_compare_pic()
# 旧相关性
self.get_old_correlation()
# 新相关性
self.get_new_correlation()
# 新增基金
self.propose_fund()
# 目标与业绩
self.objectives_performance(self.group_result)
# 新收益比较
self.get_transfer_suggestions()
# # 新增基金
# self.propose_fund()
# # 新收益比较
# self.get_transfer_suggestions()
# # 新相关性
# self.get_new_correlation()
# 渲染模版
self.render_data()
......@@ -247,14 +247,14 @@ class DataIntegrate:
'contribution_decomposition': self.contribution_decomposition,
'single_fund_data_list': self.single_fund_data_list,
'old_correlation': self.old_correlation,
'new_correlation': self.new_correlation,
'propose_fund_data_list': self.propose_fund_data_list,
'suggestions_result': self.suggestions_result,
'suggestions_result_asset': self.suggestions_result_asset,
'old_return_compare_pic': self.old_return_compare_pic,
'return_compare_pic': self.return_compare_pic,
# 'new_correlation': self.new_correlation,
# 'propose_fund_data_list': self.propose_fund_data_list,
# 'suggestions_result': self.suggestions_result,
# 'suggestions_result_asset': self.suggestions_result_asset,
# 'return_compare_pic': self.return_compare_pic,
'indicator_compare': self.indicator_compare,
'new_group_evaluation': self.new_group_evaluation
# 'new_group_evaluation': self.new_group_evaluation
}
# 开始渲染html模板
......
......@@ -168497,3 +168497,161 @@ FROM customer
WHERE customer.id = %(param_1)s
2020-12-09 18:49:00 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804182482944'}
2020-12-09 18:49:19 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 19:24:22 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 19:24:22 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:24:22 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 19:24:22 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:24:22 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 19:24:22 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:24:22 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 19:24:22 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:24:22 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 19:24:22 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:24:22 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 19:24:22 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:24:22 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 19:24:22 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 19:24:22 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944', 'customer_id_2': '6716613804966817792'}
2020-12-09 19:24:22 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 19:24:22 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 19:24:53 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 19:24:53 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804182482944'}
2020-12-09 19:25:05 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 19:34:56 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 19:34:56 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:34:56 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 19:34:56 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:34:56 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 19:34:56 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:34:56 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 19:34:56 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:34:56 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 19:34:56 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:34:56 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 19:34:56 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:34:56 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 19:34:56 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 19:34:56 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944', 'customer_id_2': '6716613804966817792'}
2020-12-09 19:34:56 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 19:34:56 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 19:35:14 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 19:36:05 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 19:36:05 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36:05 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 19:36:05 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36:05 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 19:36:05 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36:05 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 19:36:05 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36:05 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 19:36:05 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36:05 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 19:36:05 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36:05 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 19:36:05 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 19:36:05 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944', 'customer_id_2': '6716613804966817792'}
2020-12-09 19:36:05 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 19:36:05 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 19:36:22 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 19:36:44 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 19:36:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36:44 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 19:36:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36:44 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 19:36:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36:44 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 19:36:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36:44 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 19:36:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36: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 19:36:44 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:36:44 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 19:36: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 19:36:44 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944', 'customer_id_2': '6716613804966817792'}
2020-12-09 19:36: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 19:36:44 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 19:37:05 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 19:37:18 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 19:37:18 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:18 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 19:37:18 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:18 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 19:37:18 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:18 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 19:37:18 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:18 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 19:37:18 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:18 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 19:37:18 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:18 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 19:37:18 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 19:37:18 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944', 'customer_id_2': '6716613804966817792'}
2020-12-09 19:37:18 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 19:37:18 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 19:37:35 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 19:37:47 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 19:37:47 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:47 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 19:37:47 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:47 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 19:37:47 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:47 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 19:37:47 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:47 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 19:37:47 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:47 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 19:37:47 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:37:47 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 19:37:47 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 19:37:47 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944', 'customer_id_2': '6716613804966817792'}
2020-12-09 19:37:47 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 19:37:47 Wed sqlalchemy.engine.base.Engine INFO {'param_1': '6716613804966817792'}
2020-12-09 19:38:04 Wed sqlalchemy.engine.base.Engine INFO COMMIT
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO SHOW VARIABLES LIKE 'sql_mode'
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO SELECT DATABASE()
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test plain returns' AS CHAR(60)) AS anon_1
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO SELECT CAST('test unicode returns' AS CHAR(60)) AS anon_1
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:39:10 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 19:39:10 Wed sqlalchemy.engine.base.Engine INFO {}
2020-12-09 19:39:10 Wed sqlalchemy.engine.base.Engine INFO BEGIN (implicit)
2020-12-09 19:39:10 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 19:39:10 Wed sqlalchemy.engine.base.Engine INFO {'ifa_id_1': 'USER_INFO15916072577875', 'customer_id_1': '6716613804182482944', 'customer_id_2': '6716613804966817792'}
2020-12-09 19:39:10 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 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
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