继续修复上个bug的年化

app/service/result_service_v2.py

@@ -56,6 +56,11 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
             return_ratio_df, month_return_ratio_df, contribution_decomposition = self.combination_yield(resample_cur_folio_result_cnav_data,
                                                                                  fund_id_list)
             resample_df = resample(return_ratio_df, self.trade_cal_date, freq_max)
+            if resample_df.index.values[-1] > self.end_date:
+                last = resample_df.index.values[-1]
+                resample_df["index_date"] = resample_df.index
+                resample_df.loc[last, "index_date"] = self.end_date
+                resample_df.set_index("index_date", inplace=True)
             resample_df = resample_df[resample_df.index <= self.end_date]
 
 
@@ -229,6 +234,11 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
         resample_cur_folio_result_cnav_data = resample_cur_folio_result_cnav_data[resample_cur_folio_result_cnav_data.index <=self.end_date]
         return_ratio_df, month_return_ratio_df, contribution_decomposition = self.combination_yield(resample_cur_folio_result_cnav_data, fund_id_list)
         resample_df = resample(return_ratio_df, self.trade_cal_date, freq_max)
+        if resample_df.index.values[-1] > self.end_date:
+            last = resample_df.index.values[-1]
+            resample_df["index_date"] = resample_df.index
+            resample_df.loc[last, "index_date"] = self.end_date
+            resample_df.set_index("index_date", inplace=True)
         resample_df = resample_df[resample_df.index <= self.end_date]
 
         # 总成本