Browse Source

小修小补

Joey 5 months ago
parent
commit
ab634ff3e0
1 changed files with 4 additions and 4 deletions
  1. 4 4
      modules/dataPuller.dos

+ 4 - 4
modules/dataPuller.dos

@@ -366,7 +366,7 @@ def get_portfolio_info(portfolio_ids) {
     
     if(s_entity_ids == NULL || s_entity_ids == '') return null;
 
-    s_query = "SELECT cpm.id AS portfolio_id, cpm.userid, cpm.customer_id, cpm.inception_date, cpm.portfolio_source, cpm.portfolio_type
+    s_query = "SELECT cpm.id AS portfolio_id, cpm.userid, cpm.customer_id, cpm.inception_date, 1 AS ini_value, cpm.portfolio_source, cpm.portfolio_type
                FROM pfdb.`pf_customer_portfolio_map` cpm
                INNER JOIN pfdb.cm_user u ON cpm.userid = u.userid
                WHERE cpm.id IN (" + portfolio_ids + ")
@@ -521,13 +521,13 @@ def get_fund_primary_benchmark(fund_ids, month_start, month_end) {
 
 /*
  *  取某时间段的组合主基准
- *  NOTE: 目前所有组合默认主基准是沪深300,以后很可能会改
+ *  NOTE: 目前所有Java指标计算组合默认主基准是FA00000VNB,以后很可能会改
  * 
  *  Example: get_portfolio_primary_benchmark("166002,166114", '1990-01', '2024-08');
  */
 def get_portfolio_primary_benchmark(portfolio_ids, month_start, month_end) {
 
-    s_query = "SELECT id AS portfolio_id, 'IN00000008' AS benchmark_id, inception_date
+    s_query = "SELECT id AS portfolio_id, 'FA00000VNB' AS benchmark_id, inception_date
                FROM pfdb.pf_customer_portfolio_map
                WHERE id IN (" + portfolio_ids + ")
                  AND isvalid = 1;";
@@ -789,7 +789,7 @@ def get_entity_indicaor(entity_type, entity_ids, start_date, end_date, isFromMyS
 /*
  *  取持有基金净值更新的组合列表
  *  
- *  TODO: 需要跑2分钟,待优化
+ *  TODO: 需要跑3分钟,待优化
  * 
  *  Example: get_portfolio_list_by_fund_nav_updatetime([166002,166114], 2024.10.28, true);
  */