Merge remote-tracking branch 'origin/dev' into dev

6c75e21f · pengxiong@wealthgrow.cn · 28776226 · 70bd37f1 · 6c75e21f · 6c75e21f
Commit 6c75e21f authored Dec 03, 2020 by pengxiong@wealthgrow.cn
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 101 additions and 38 deletions

portfolio_diagnose.py app/service/portfolio_diagnose.py +100 -37

result_service.py app/service/result_service.py +1 -1

No files found.
--- a/app/service/portfolio_diagnose.py
+++ b/app/service/portfolio_diagnose.py
--- a/app/service/result_service.py
+++ b/app/service/result_service.py
@@ -159,7 +159,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
            index_result = self.signal_fund_profit_result(index_df[index_df.index >= pd.to_datetime(first_trade_date)],
                                                          "index")
            folio_report_data["index_result"] = index_result
-
+            folio_report_data["return_df"] = resample_df
            self.group_result_data[folio] = folio_report_data

        return self.group_result_data