Joey hai 5 meses
pai
achega
97319c0fd4
Modificáronse 1 ficheiros con 6 adicións e 6 borrados
  1. 6 6
      modules/indicatorCalculator.dos

+ 6 - 6
modules/indicatorCalculator.dos

@@ -1010,7 +1010,7 @@ def cal_monthly_indicators(entity_type, indicator_type, monthly_returns) {
 
     oldest_date = EXEC price_date.min() FROM monthly_returns;
 
-    v_entity_ids = (SELECT DISTINCT entity_id FROM monthly_returns).entity_id;
+    v_entity_ids = EXEC DISTINCT entity_id FROM monthly_returns;
     
     entity_info = get_entity_info(entity_type, v_entity_ids);
     
@@ -1157,7 +1157,7 @@ def cal_fund_bfi_indicators(entity_type, fund_ids, end_day, isFromNav) {
  *  
  *  Example: cal_portfolio_indicators('166002,166114', 2024.08.31, 1, true);
  * 
- */
+ 
 def cal_portfolio_indicators(portfolio_ids, end_day, cal_method, isFromNav) {
 
     very_old_date = 1990.01.01;
@@ -1219,7 +1219,7 @@ def cal_portfolio_indicators(portfolio_ids, end_day, cal_method, isFromNav) {
 }
 
 
-/*
+
  *   Calculate historcial portfolio trailing BFI indicators 
  *  
  *  @param portfolio_ids <STRING>: comma-delimited portfolio ids
@@ -1231,7 +1231,7 @@ def cal_portfolio_indicators(portfolio_ids, end_day, cal_method, isFromNav) {
  *   
  *  Example: cal_portfolio_bfi_indicators('166002,166114', 2024.08.31, 1, true);
  * 
- */
+ 
 def cal_portfolio_bfi_indicators(portfolio_ids, end_day, cal_method, isFromNav) {
 
     very_old_date = 1990.01.01;
@@ -1290,7 +1290,7 @@ def cal_portfolio_bfi_indicators(portfolio_ids, end_day, cal_method, isFromNav)
 
 }
 
-
+*/
 
 /*
  *   【Morningstar Integration】通用月度指标计算
@@ -1368,4 +1368,4 @@ def ms_cal_monthly_indicators(entity_type, indicator_type, monthly_returns) {
 
     return dict(v_table_name, t0);
 	
-}
+}