diff --git a/Million Buyer/MainForm.cs b/Million Buyer/MainForm.cs index 5ed4865..deeaf63 100644 --- a/Million Buyer/MainForm.cs +++ b/Million Buyer/MainForm.cs @@ -296,7 +296,7 @@ namespace Million_Buyer } })); - //5초에 한번씩 부르게 처리 + //5초에 한번씩 부르게 처리 Thread.Sleep(5000); } InsertLog("Order Thread End"); diff --git a/Million Hunter/HunterSubForm/LoadResultViewerForm.cs b/Million Hunter/HunterSubForm/LoadResultViewerForm.cs index 62983f0..719ce1d 100644 --- a/Million Hunter/HunterSubForm/LoadResultViewerForm.cs +++ b/Million Hunter/HunterSubForm/LoadResultViewerForm.cs @@ -145,6 +145,8 @@ namespace Million.HunterSubForm var selectedResultData = (SavedResultData)treeList.GetDataRecordByNode(hitInfo.Node); + selectedResultData = DBConnection.QueryGetExcuter_SearchResultData(selectedResultData); + //Main 폼의 SaveResultData 초기화 _mainForm._saveResultData = null; //Main 폼의 SaveResultData 초기화 (클론 복사 해야할 수 있음) diff --git a/Million/DbMangement/DBConnection.cs b/Million/DbMangement/DBConnection.cs index 7a162ad..32b1735 100644 --- a/Million/DbMangement/DBConnection.cs +++ b/Million/DbMangement/DBConnection.cs @@ -674,6 +674,49 @@ namespace Million.DbManagement return returnData; } + /// + /// SavedResultData의 데이터를 기준으로 SearchResultList를 포함 + /// + /// + /// + /// + public static SavedResultData QueryGetExcuter_SearchResultData(SavedResultData data) + { + if (data != null && data.Id > 0) + { + var sqlQuery = @"SELECT [SearchResultList] FROM [ResultData].[dbo].[SavedResultData] WHERE [Id] = " + data.Id; + + var strDBCon = CommonProperty.DbConnectionResultData; + + using (var conn = new SqlConnection(strDBCon)) + { + using (var cmd = new SqlCommand(sqlQuery, conn)) + { + try + { + conn.Open(); + + using (var rdr = cmd.ExecuteReader()) + { + while (rdr.Read()) + { + data.SearchResultList = (List)GetBinaryConvertClass(rdr, "SearchResultList"); + } + } + conn.Close(); + } + catch (Exception ex) + { + Console.WriteLine(" ============= exception ==============="); + Console.WriteLine(ex.Message); + conn.Close(); + return data; + } + } + } + } + return data; + } /// /// Get SavedResultData @@ -684,7 +727,25 @@ namespace Million.DbManagement public static List QueryGetExcuter_SavedResultData(List idList = null, bool includeFolder = true) { var returnData = new List(); - var sqlQuery = "SELECT * FROM [ResultData].[dbo].[SavedResultData] WHERE [Type] IN('Data'"; + var sqlQuery = @"SELECT [Id] + ,[ParentId] + ,[Name] + ,[StartDateTime] + ,[EndDateTime] + ,[SavedDateTime] + ,[BuySetupList] + ,[SellSetupList] + ,[BuyRegularExpression] + ,[SellRegularExpression] + ,[ResultDataCount] + ,[WinRate] + ,[ProfitRate] + ,[FirstProfitRate] + ,[FirstWinRate] + ,[ExchangePlace] + ,[Type] + ,[SaveResultType] + ,[Description] FROM [ResultData].[dbo].[SavedResultData] WHERE [Type] IN('Data'"; if (includeFolder) sqlQuery += ",'Folder'"; @@ -723,7 +784,7 @@ namespace Million.DbManagement var data = new SavedResultData(); data.BuySetupList = (List)GetBinaryConvertClass(rdr, "BuySetupList"); data.SellSetupList = (List)GetBinaryConvertClass(rdr, "SellSetupList"); - data.SearchResultList = (List)GetBinaryConvertClass(rdr, "SearchResultList"); + //data.SearchResultList = (List)GetBinaryConvertClass(rdr, "SearchResultList"); int.TryParse(rdr["Id"]?.ToString(), out var id); data.Id = id;