Commit 7adeb860 authored by 赵杰's avatar 赵杰

内部订单只有一个的时候用简单收益替换组合

parent 2d09b31b
...@@ -204,7 +204,20 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor): ...@@ -204,7 +204,20 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
correlation = self.old_correlation(df_) correlation = self.old_correlation(df_)
folio_report_data["correlation"] = correlation folio_report_data["correlation"] = correlation
self.group_result_data[folio] = folio_report_data self.group_result_data[folio] = folio_report_data
folio_name = list(self.group_data.keys())[0]
if len(self.group_data) == 1 and len(self.group_result_data[folio_name]["group_hoding_info"]) == 1:
self.total_result_data["cur_month_profit_ratio"] = float(self.group_result_data[folio_name]["group_hoding_info"][0]["month_return_ratio"])/100.0
self.total_result_data["cumulative_return"] = float(
self.group_result_data[folio_name]["group_hoding_info"][0]["cum_profit_ratio"]) / 100.0 + 1
self.total_result_data["return_ratio_year"] = float(
self.group_result_data[folio_name]["group_hoding_info"][0]["return_ratio_year"]) / 100.0
self.group_result_data[folio_name]["group_hoding_info_total"]["cur_month_profit_ratio"] = \
self.group_result_data[folio_name]["group_hoding_info"][0]["month_return_ratio"]
self.group_result_data[folio_name]["group_hoding_info_total"]["cumulative_return"] = \
self.group_result_data[folio_name]["group_hoding_info"][0]["cum_profit_ratio"]
self.group_result_data[folio_name]["group_hoding_info_total"]["return_ratio_year"] = \
self.group_result_data[folio_name]["group_hoding_info"][0]["return_ratio_year"]
return self.group_result_data return self.group_result_data
# 综述数据 # 综述数据
......
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