上传文件至 ''

DataAccess.cs

@@ -402,6 +402,13 @@ namespace DataManager
 
         }
 
+        /// <summary>
+        /// 从 mfdb 里取NAV
+        /// </summary>
+        /// <param name="fundId"></param>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
+        /// <returns></returns>
         public static DataTable Get_Nav(string fundId, DateTime? startDate, DateTime? endDate)
         {
             MySqlConnection connection = new MySqlConnection(connectionString);
@@ -425,6 +432,40 @@ namespace DataManager
             return dt;
         }
 
+        /// <summary>
+        /// 从 raw_db 里取原始NAV
+        /// </summary>
+        /// <param name="fundId"></param>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
+        /// <returns></returns>
+        public static DataTable Get_dm_nav(string fundId, string providerId, string externalId, DateTime? startDate, DateTime? endDate)
+        {
+            MySqlConnection connection = new MySqlConnection(connectionString);
+            MySqlDataAdapter ad = new MySqlDataAdapter("sp_get_dm_nav", connection);
+
+            MySqlParameter i_fund_id = new MySqlParameter("i_fund_id", fundId);
+            MySqlParameter i_provider_id = new MySqlParameter("i_provider_id", providerId);
+            MySqlParameter i_external_id = new MySqlParameter("i_external_id", externalId);
+            MySqlParameter i_start_date = new MySqlParameter("i_start_date", startDate);
+            MySqlParameter i_end_date = new MySqlParameter("i_end_date", endDate);
+
+            ad.SelectCommand.Parameters.Add(i_fund_id);
+            ad.SelectCommand.Parameters.Add(i_provider_id);
+            ad.SelectCommand.Parameters.Add(i_external_id);
+            ad.SelectCommand.Parameters.Add(i_start_date);
+            ad.SelectCommand.Parameters.Add(i_end_date);
+
+            ad.SelectCommand.CommandType = CommandType.StoredProcedure;
+
+            DataTable dt = new DataTable();
+            ad.Fill(dt);
+
+            connection.Close();
+
+            return dt;
+        }
+
         public static DataTable Get_dm_memo(sbyte jobType, int taskId)
         {
             MySqlConnection connection = new MySqlConnection(connectionString);

NavChart.cs

@@ -90,7 +90,7 @@ namespace DataManager
 
             if (startDate > endDate)
             {
-                MessageBox.Show("起始日不能大于截止日哦", "建议信息", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                MessageBox.Show("起始日不能大于截止日哦");
                 return null;
             }
 

UIFund.cs

@@ -228,19 +228,24 @@ namespace DataManager
 
         private void LoadNavGrid(DateTime? startDate, DateTime? endDate)
         {
-            tbNav = DataAccess.Get_Nav(fundId, startDate, endDate);
+            tbNav = DataAccess.Get_dm_nav(fundId, null, null, startDate, endDate);
             
             grdNav.DataSource = tbNav;
             grdNav.Columns["fund_id"].Visible = false;
+            grdNav.Columns["provider_id"].Visible = false;
+            grdNav.Columns["provider_name"].HeaderText = "数据源";
+            grdNav.Columns["external_id"].HeaderText = "外部ID";
             grdNav.Columns["price_date"].HeaderText = "净值日期";
             grdNav.Columns["nav"].HeaderText = "净值";
             grdNav.Columns["cumulative_nav_withdrawal"].HeaderText = "现金分红累计净值";
             grdNav.Columns["cumulative_nav"].HeaderText = "分红再投累计净值";
             grdNav.Columns["cumulative_nav"].DefaultCellStyle.BackColor = Color.AntiqueWhite;
             grdNav.Columns["isvalid"].HeaderText = "状态";
-            grdNav.Columns["creatorid"].HeaderText = "创建";
+            grdNav.Columns["creatorid"].Visible = false;
+            grdNav.Columns["creator_name"].HeaderText = "创建";
             grdNav.Columns["createtime"].HeaderText = "创建日期";
-            grdNav.Columns["updaterid"].HeaderText = "更新";
+            grdNav.Columns["updaterid"].Visible = false;
+            grdNav.Columns["updater_name"].HeaderText = "更新";
             grdNav.Columns["updatetime"].HeaderText = "更新日期";
 
             grdNav.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;