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

app/service/result_service_v2.py

@@ -320,7 +320,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
         index_result = self.signal_fund_profit_result(index_df[index_df.index >= pd.to_datetime(first_trade_date)], "index")
         report_data["index_result"] = index_result
 
-        self.__month_return(cur_folio_result_cnav_data, fund_id_list)
+        # self.__month_return(cur_folio_result_cnav_data, fund_id_list)
 
         self.total_result_data = report_data
         return report_data
@@ -514,12 +514,12 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
     def get_group_data(self):
         return self.group_result_data
 
-    def __month_return(self, folio_cnav_data):
-        # 月度回报
-        def year_month(x):
-            a = x.year
-            b = x.month
-            return str(a) + "-" + str(b)
-        p_folio_cnav_data = folio_cnav_data.copy()
-        p_folio_cnav_data["date"] = p_folio_cnav_data.index
-        grouped_data = p_folio_cnav_data.groupby(p_folio_cnav_data["date"].apply(year_month))
+    # def __month_return(self, folio_cnav_data):
+    #     # 月度回报
+    #     def year_month(x):
+    #         a = x.year
+    #         b = x.month
+    #         return str(a) + "-" + str(b)
+    #     p_folio_cnav_data = folio_cnav_data.copy()
+    #     p_folio_cnav_data["date"] = p_folio_cnav_data.index
+    #     grouped_data = p_folio_cnav_data.groupby(p_folio_cnav_data["date"].apply(year_month))