Browse Source

小修小补

Joey 2 weeks ago
parent
commit
9b4cbb4423
2 changed files with 3 additions and 3 deletions
  1. 2 2
      modules/task_fundPerformance.dos
  2. 1 1
      modules/task_portfolioPerformance.dos

+ 2 - 2
modules/task_fundPerformance.dos

@@ -178,7 +178,7 @@ def calFundPerformanceTask(entityType, date) {
 	
 	
 	            save_and_sync(tb_fund_performance_weekly, 'raw_db.fund_performance_weekly', 'raw_db.fund_performance_weekly', 'fund_id', 'year_week');
 	            save_and_sync(tb_fund_performance_weekly, 'raw_db.fund_performance_weekly', 'raw_db.fund_performance_weekly', 'fund_id', 'year_week');
 	
 	
-	            save_and_sync(tb_fund_latest_performance, 'raw_db.fund_latest_performance', 'raw_db.fund_latest_nav_performance', 'fund_id', 'price_date');
+	            save_and_sync(tb_fund_latest_performance, 'raw_db.fund_latest_performance', 'raw_db.fund_latest_nav_performance', 'fund_id', 'end_date');
 	
 	
 	            // 数据初始化时将指标存入本地
 	            // 数据初始化时将指标存入本地
 	            if(end_day <= get_ini_data_const()['date']) {
 	            if(end_day <= get_ini_data_const()['date']) {
@@ -378,7 +378,7 @@ def ms_calFundReturns() {
 
 
             save_and_sync(tb_fund_performance_weekly, 'raw_db.fund_performance_weekly', 'raw_db.fund_performance_weekly', 'fund_id', 'year_week');
             save_and_sync(tb_fund_performance_weekly, 'raw_db.fund_performance_weekly', 'raw_db.fund_performance_weekly', 'fund_id', 'year_week');
 
 
-            save_and_sync(tb_fund_latest_performance, 'raw_db.fund_latest_performance', 'raw_db.fund_latest_nav_performance', 'fund_id', 'price_date');
+            save_and_sync(tb_fund_latest_performance, 'raw_db.fund_latest_performance', 'raw_db.fund_latest_nav_performance', 'fund_id', 'end_date');
 
 
         } catch(ex) {
         } catch(ex) {
 
 

+ 1 - 1
modules/task_portfolioPerformance.dos

@@ -275,7 +275,7 @@ def cal_and_save_entity_indicators(entity_type, cal_entity_info, is_save_local)
 	
 	
 				des = get_latest_performance_table_description(entity_type)[0];
 				des = get_latest_performance_table_description(entity_type)[0];
 				tb_entity_latest_performance.rename!('cumulative_nav', des.cumulative_nav_col);
 				tb_entity_latest_performance.rename!('cumulative_nav', des.cumulative_nav_col);
-	            save_and_sync(tb_entity_latest_performance, des.table_name.strReplace('pfdb', 'raw_db').strReplace('mfdb', 'raw_db'), , des.sec_id_col, 'price_date');
+	            save_and_sync(tb_entity_latest_performance, des.table_name.strReplace('pfdb', 'raw_db').strReplace('mfdb', 'raw_db'), , des.sec_id_col, 'end_date');
 	            if(is_save_local == true) save_table(tb_entity_latest_performance, des.table_name, false);
 	            if(is_save_local == true) save_table(tb_entity_latest_performance, des.table_name, false);