修改市值数据

app/service/result_service.py

@@ -280,7 +280,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
             fund_hoding_info = {"fund_strategy_name": dict_substrategy[int(row["substrategy"])], "fund_name": row["fund_name"]}
             fund_hoding_info["confirm_date"] = row["confirm_share_date"]
             fund_hoding_info["weight"] = round(float(row["confirm_amount"]) / p_total_amount * 100, 2)
-            fund_hoding_info["market_values"] = round(float(row["confirm_share"]) * (fund_basic_info["cur_cnav"] - confirm_cnav) + float(row["confirm_amount"])/10000, 2)
+            fund_hoding_info["market_values"] = round((float(row["confirm_share"]) * (fund_basic_info["cur_cnav"] - confirm_cnav) + float(row["confirm_amount"]))/10000, 2)
             fund_hoding_info["cost"] = round(float(row["confirm_amount"])/10000, 2)
             fund_hoding_info["profit"] = round(float(row["confirm_share"]) * (fund_basic_info["cur_cnav"] - confirm_cnav)/10000, 2)
             # fund_hoding_info["ykb"] = fund_hoding_info["profit"] / fund_hoding_info["cost"]

jinjia2html.py

@@ -46,6 +46,8 @@ index_volatility = round(group_result["index_result"]["volatility"]*100, 2)
 index_max_withdrawal = round(group_result["index_result"]["max_drawdown"][0]*100, 2)
 index_sharpe_ratio = round(group_result["index_result"]["sharpe"], 2)
 
+group_nav_info = group_result["group_nav_info"]
+group_hoding_info = group_result["group_hoding_info"]
 
 # 全部数据
 data = {'customer_name':'成龙', 'customer_gender':'女',
@@ -66,6 +68,8 @@ data = {'customer_name':'成龙', 'customer_gender':'女',
         'index_comparison_500':{'section_return':index_section_return, 'annualized_returns': index_annualised_return,
                             'volatility':index_volatility, 'max_withdrawal':index_max_withdrawal, 'sharpe_ratio':index_sharpe_ratio},
         'monthly_return_performance_pic':monthly_return_performance_pic,
+        'group_nav_info': group_nav_info,
+        'group_hoding_info': group_hoding_info
         }