小修小补

modules/dataSaver.dos

@@ -705,7 +705,7 @@ def generate_entity_performance(entity_info, indicators, isToMySQL, mutable enti
  * 
  * 
  */
-def generate_entity_risk_stats(entity_info, indicators, isToMySQL, mutable entity_risk_stats, extra_keys) {
+def generate_entity_risk_stats(entity_info, indicators, isToMySQL, mutable entity_risk_stats, extra_keys=[]) {
 
     t = null;
 
@@ -765,7 +765,7 @@ def generate_entity_risk_stats(entity_info, indicators, isToMySQL, mutable entit
  * 
  * 
  */
-def generate_entity_riskadjret_stats(entity_info, indicators, isToMySQL, mutable entity_riskadjret_stats, extra_keys) {
+def generate_entity_riskadjret_stats(entity_info, indicators, isToMySQL, mutable entity_riskadjret_stats, extra_keys=[]) {
 
     t = null;
 
@@ -822,7 +822,7 @@ def generate_entity_riskadjret_stats(entity_info, indicators, isToMySQL, mutable
  * 
  * 
  */
-def generate_entity_indicator(entity_info, indicators, isToMySQL, mutable entity_indicator, extra_keys) {
+def generate_entity_indicator(entity_info, indicators, isToMySQL, mutable entity_indicator, extra_keys=[]) {
 
     t = null;
 
@@ -880,7 +880,7 @@ def generate_entity_indicator(entity_info, indicators, isToMySQL, mutable entity
  * 
  * 
  */
-def generate_entity_style_stats(entity_info, indicators, isToMySQL, mutable entity_style_stats, extra_keys) {
+def generate_entity_style_stats(entity_info, indicators, isToMySQL, mutable entity_style_stats, extra_keys=[]) {
 
     t = null;
 
@@ -935,7 +935,7 @@ def generate_entity_style_stats(entity_info, indicators, isToMySQL, mutable enti
  *   TODO: why we need isToMySQL here?
  *         其它的指标恐怕也要按这个改，因为私募可能会有近6月没有数据但近2年之类的周期有数据的情况！
  */
-def generate_entity_bfi_indicator(entity_info, indicators, isToMySQL, mutable entity_bfi_indicator, extra_keys) {
+def generate_entity_bfi_indicator(entity_info, indicators, isToMySQL, mutable entity_bfi_indicator, extra_keys=[]) {
 
     t = null;
 

modules/rankingCalculator.dos

@@ -230,7 +230,7 @@ def prepare_data_for_ranking(ranking_by, entity_type, entity_info, end_date, isF
 
 		// bfi table
 		table_desc = get_bfi_by_category_group_table_description(entity_type);
-		tb_bfi = SELECT portfolio_id, end_date, factor_id FROM get_monthly_indicator_data(table_desc.table_name[0], end_date, isFromMySQL);
+		tb_bfi = get_monthly_indicator_data(table_desc.table_name[0], end_date, isFromMySQL);
 
 		// bfi (as benchmark) indicator
 		table_desc = get_bfi_indicator_table_description(entity_type);

modules/task_monthlyPerformance.dos

@@ -321,11 +321,11 @@ def cal_and_save_mc_indicator(entity_type, entity_date, monthly_returns, is_save
 /*
  *  [定时任务]: 基金经理/公司月净值计算
  * 
- * 
+ *   Example: CalMCNavTask('CO', 2024.11.04);
  */
 def CalMCNavTask(entity_type, updatetime) {
 //updatetime = 2024.11.05;
-
+//entity_type = 'CO';
 	if(!(entity_type IN ['PL', 'CO'])) return;
 
 	is_save_local = iif(updatetime <= get_ini_data_const()['updatetime'], true, false);
@@ -341,7 +341,7 @@ def CalMCNavTask(entity_type, updatetime) {
 	}
 	
 	// 15 sec
-	cal_and_save_mc_nav('PL', entity_date, is_save_local);
+	cal_and_save_mc_nav(entity_type, entity_date, is_save_local);
 
 	entity_date = null;
 
@@ -350,7 +350,7 @@ def CalMCNavTask(entity_type, updatetime) {
 /*
  *   [定时任务]: 基金经理/公司月收益及指标计算
  * 
- * 
+ *   Example: CalMCIndicatorTask('CO', 2024.11.04);
  */
 def CalMCIndicatorTask(entity_type, updatetime) {
 //	entity_type = 'PL';
@@ -369,7 +369,7 @@ def CalMCIndicatorTask(entity_type, updatetime) {
 	UPDATE tb_monthly_ret SET price_date = end_date.temporalFormat('yyyy-MM-dd').temporalParse('yyyy-MM-dd').businessMonthEnd() WHERE price_date IS NULL;
 
 	// 40+ min
-	cal_and_save_mc_indicator('PL', entity_date, tb_monthly_ret, is_save_local);
+	cal_and_save_mc_indicator(entity_type, entity_date, tb_monthly_ret, is_save_local);
 
 	tb_monthly_ret = null;
 

modules/task_weeklyPerformnce.dos

@@ -283,8 +283,8 @@ def calEntityBfiIndicatorTask(entityType, date) {
             save_and_sync(tb_bfi_indicator, t_desc.table_name[0].strReplace(db_name, 'raw_db'), t_desc.table_name[0].strReplace(db_name, 'raw_db'));
 
             // 数据初始化时将指标存入本地，做排名之用
-            if(end_day <= get_ini_data_const()['date']) {
-            	save_table(tb_bfi_indicator, t_desc0.table_name[0], false);
+            if(end_day <= get_ini_data_const()['date'])
+            	save_table(tb_bfi_indicator, t_desc.table_name[0], false);
 
         } catch(ex) {