From 0105c8ae6c2a3bbc0e4e8d46c3f4a33eb4cfabdc Mon Sep 17 00:00:00 2001
From: kyh <1329522@naver.com>
Date: Tue, 21 Mar 2023 12:42:14 +0900
Subject: [PATCH] =?UTF-8?q?SearchResultList=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8A=94=20=EC=86=8D=EB=8F=84=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=A1=9C=EC=A7=81=20=EB=B6=84=ED=95=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Million Buyer/MainForm.cs                     |  2 +-
 .../HunterSubForm/LoadResultViewerForm.cs     |  2 +
 Million/DbMangement/DBConnection.cs           | 65 ++++++++++++++++++-
 3 files changed, 66 insertions(+), 3 deletions(-)

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;
         }
 
+        /// <summary>
+        ///     SavedResultData의 데이터를 기준으로 SearchResultList를 포함 
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        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<SearchResult>)GetBinaryConvertClass(rdr, "SearchResultList");
+                                }
+                            }
+                            conn.Close();
+                        }
+                        catch (Exception ex)
+                        {
+                            Console.WriteLine(" ============= exception ===============");
+                            Console.WriteLine(ex.Message);
+                            conn.Close();
+                            return data;
+                        }
+                    }
+                }
+            }
+            return data;
+        }
 
         /// <summary>
         ///     Get SavedResultData
@@ -684,7 +727,25 @@ namespace Million.DbManagement
         public static List<SavedResultData> QueryGetExcuter_SavedResultData(List<int> idList = null, bool includeFolder = true)
         {
             var returnData = new List<SavedResultData>();
-            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<object>)GetBinaryConvertClass(rdr, "BuySetupList");
                                 data.SellSetupList = (List<object>)GetBinaryConvertClass(rdr, "SellSetupList");
-                                data.SearchResultList = (List<SearchResult>)GetBinaryConvertClass(rdr, "SearchResultList");
+                                //data.SearchResultList = (List<SearchResult>)GetBinaryConvertClass(rdr, "SearchResultList");
 
                                 int.TryParse(rdr["Id"]?.ToString(), out var id);
                                 data.Id = id;