diff --git "a/app/pdf/\347\216\213\346\226\220_\345\210\230\345\233\275\351\223\255_.pdf" "b/app/pdf/\347\216\213\346\226\220_\345\210\230\345\233\275\351\223\255_.pdf" new file mode 100644 index 0000000000000000000000000000000000000000..08090032303bbf3129a660db8655bd9817525000 Binary files /dev/null and "b/app/pdf/\347\216\213\346\226\220_\345\210\230\345\233\275\351\223\255_.pdf" differ diff --git a/app/templates/v2/monthReportV2.html b/app/templates/v2/monthReportV2.html index ab9891985392fef048195bdd0156bcd4f5e7291b..9ae35cb72360caf2a5e9fbc4a85e41a297fe8067 100644 --- a/app/templates/v2/monthReportV2.html +++ b/app/templates/v2/monthReportV2.html @@ -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> </tr> diff --git a/app/utils/jinjia2html.py b/app/utils/jinjia2html.py index 67ebd39ddca888b54deb0fcc769308cae1dbba9a..b54520ee1f25eb7606d67a516a684572c72f3d2e 100644 --- a/app/utils/jinjia2html.py +++ b/app/utils/jinjia2html.py @@ -254,8 +254,15 @@ class DataIntegrate: # 'suggestions_result': self.suggestions_result, # 'suggestions_result_asset': self.suggestions_result_asset, # '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_correlation': [], + 'propose_fund_data_list': [], + 'suggestions_result': {}, + 'suggestions_result_asset': {}, + 'return_compare_pic': [], + 'indicator_compare': [], + 'new_group_evaluation': [] } # 开始渲染htmlæ¨¡æ¿ diff --git a/app/utils/timed_task.py b/app/utils/timed_task.py index bb66d74d21c8218ea8b33d3bc3c0a32ae390e6a5..8b7144e9c4d0482a97fae0c950a1233671ea6d93 100644 --- a/app/utils/timed_task.py +++ b/app/utils/timed_task.py @@ -54,8 +54,8 @@ with TAMP_SQL(tamp_user_engine) as tamp_user, TAMP_SQL(tamp_order_engine) as tam for ifauser in ifausers: # èŽ·å–æŸä¸ª 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 for customer in customers: customer_full = tamp_order_session.query(Customer).\ diff --git a/logs/tamp_course_order.log b/logs/tamp_course_order.log index 7109e7bcbca7ffe6686c18789781b0bae89cec75..66a9dec6401a55cb580da08a58240721e6fab8d9 100644 --- a/logs/tamp_course_order.log +++ b/logs/tamp_course_order.log @@ -168655,3 +168655,157 @@ 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 +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