From 41c8125832f546e282d492a64819f4d976baa3ab Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 26 Nov 2025 13:36:13 +0900 Subject: [PATCH] =?UTF-8?q?251126=5F01=5FENH:=20SCREEN=20=EC=A7=91?= =?UTF-8?q?=EA=B3=84=20=EC=BF=BC=EB=A6=AC=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- REPORT_API_ver6/Services/Project.cs | 55 +++++++++++++++++------------ 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/REPORT_API_ver6/Services/Project.cs b/REPORT_API_ver6/Services/Project.cs index fd88d08..ada82ae 100644 --- a/REPORT_API_ver6/Services/Project.cs +++ b/REPORT_API_ver6/Services/Project.cs @@ -714,35 +714,46 @@ namespace REPORT_API_ver6.Services DataTable returnTable = new DataTable(); string sqlString = ""; - sqlString += " SELECT Qorder" + Environment.NewLine; - sqlString += " , JSON_VALUE(QUESTIONJSON,'$.variable') + '. '+ CASE WHEN JSON_VALUE(QUESTIONJSON, '$.explain') = '' THEN JSON_VALUE(QUESTIONJSON,'$.title') ELSE JSON_VALUE(QUESTIONJSON,'$.explain') END as VIEWTITLE" + Environment.NewLine; - sqlString += " , JSON_VALUE(QUESTIONJSON,'$.variable') as PAGENAME" + Environment.NewLine; - sqlString += " , count(1) as CNT" + Environment.NewLine; - sqlString += " FROM (" + Environment.NewLine; - sqlString += " SELECT distinct ROW_NUMBER() OVER (PARTITION BY DA.IDKEY ORDER BY Qorder desc) AS QorderNum" + Environment.NewLine; - sqlString += " ,DA.IDKEY, Qorder, QUESTIONJSON" + Environment.NewLine; - sqlString += " from [data] DA with(nolock)" + Environment.NewLine; - sqlString += " cross apply openjson(survey_date) SD" + Environment.NewLine; - sqlString += " inner join (" + Environment.NewLine; - sqlString += " select pkey, idkey, MAX(IN_SD.[value]) as LAST_TIME" + Environment.NewLine; - sqlString += " from [data] IN_DA with(nolock)" + Environment.NewLine; - sqlString += " cross apply openjson(survey_date) IN_SD" + Environment.NewLine; - sqlString += " where IN_DA.pkey = '" + pkey + "' and survey_type<>'test' and[Status] = '99'" + Environment.NewLine; - sqlString += " group by pkey, idkey" + Environment.NewLine; - sqlString += " ) LT on LT.PKEY = DA.PKEY and LT.IDKEY = DA.IDKEY and LT.LAST_TIME = SD.[value]" + Environment.NewLine; - sqlString += " inner join [QUESTION] QU with(nolock) on LT.PKEY = QU.PKEY and SD.[key] COLLATE Korean_Wansung_CI_AS = QU.QID" + Environment.NewLine; + sqlString += $"WITH SD AS ( " + Environment.NewLine; + sqlString += $" SELECT " + Environment.NewLine; + sqlString += $" IN_DA.pkey, " + Environment.NewLine; + sqlString += $" IN_DA.idkey, " + Environment.NewLine; + sqlString += $" IN_SD.[key] AS last_key, " + Environment.NewLine; + sqlString += $" IN_SD.[value] AS last_time, " + Environment.NewLine; + sqlString += $" ROW_NUMBER() OVER ( " + Environment.NewLine; + sqlString += $" PARTITION BY IN_DA.pkey, IN_DA.idkey " + Environment.NewLine; + sqlString += $" ORDER BY IN_SD.[value] DESC -- MAX 기준 " + Environment.NewLine; + sqlString += $" ) AS rn " + Environment.NewLine; + sqlString += $" FROM [data] IN_DA WITH (NOLOCK) " + Environment.NewLine; + sqlString += $" CROSS APPLY OPENJSON(IN_DA.survey_date) AS IN_SD " + Environment.NewLine; + sqlString += $" WHERE IN_DA.pkey = '{pkey}' " + Environment.NewLine; + sqlString += $" AND IN_DA.survey_type <> 'test' " + Environment.NewLine; + sqlString += $" AND IN_DA.[Status] = '99' " + Environment.NewLine; + + sqlString += $") " + Environment.NewLine; + + sqlString += $" SELECT Qorder " + Environment.NewLine; + sqlString += $" , JSON_VALUE(QUESTIONJSON,'$.variable') + '. '+ CASE WHEN JSON_VALUE(QUESTIONJSON, '$.explain') = '' THEN JSON_VALUE(QUESTIONJSON,'$.title') ELSE JSON_VALUE(QUESTIONJSON,'$.explain') END as VIEWTITLE " + Environment.NewLine; + sqlString += $" , JSON_VALUE(QUESTIONJSON,'$.variable') as PAGENAME " + Environment.NewLine; + sqlString += $" , count(1) as CNT " + Environment.NewLine; + sqlString += $" FROM ( " + Environment.NewLine; + sqlString += $" SELECT SD.IDKEY, Qorder, QUESTIONJSON " + Environment.NewLine; + sqlString += $" from SD " + Environment.NewLine; + sqlString += $" inner join [QUESTION] QU with(nolock) on SD.PKEY = QU.PKEY and SD.last_key COLLATE Korean_Wansung_CI_AS = QU.QID " + Environment.NewLine; + sqlString += $" WHERE SD.rn = 1 " + Environment.NewLine; if (Common.IsJson(selectDate)) { JObject sqlDate = Common.GetJObjectFromString(selectDate); if (sqlDate.Count > 0) { - sqlString += " where CONVERT(DATE, LT.LAST_TIME) >= CONVERT(DATE,'" + sqlDate["sDate"].ToString() + "')" + Environment.NewLine; - sqlString += " and CONVERT(DATE, LT.LAST_TIME) <= CONVERT(DATE,'" + sqlDate["eDate"].ToString() + "')" + Environment.NewLine; + sqlString += " and CONVERT(DATE, SD.LAST_TIME) >= CONVERT(DATE,'" + sqlDate["sDate"].ToString() + "')" + Environment.NewLine; + sqlString += " and CONVERT(DATE, SD.LAST_TIME) <= CONVERT(DATE,'" + sqlDate["eDate"].ToString() + "')" + Environment.NewLine; } } - sqlString += " ) OUT_A"+Environment.NewLine; - sqlString += " group by Qorder,QUESTIONJSON" + Environment.NewLine; - sqlString += " order by Qorder" + Environment.NewLine; + sqlString += $" ) OUT_A " + Environment.NewLine; + sqlString += $" group by Qorder,QUESTIONJSON " + Environment.NewLine; + sqlString += $" order by Qorder " + Environment.NewLine; + DAL dal = new DAL(); var connection = dal.ConnectKonKiwi(iskiwi); try