From 69400ed89f48c1bcfdf6411d349cebd72dfb7c01 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 31 Aug 2023 16:30:34 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EB=A9=94=EB=89=B4?=
 =?UTF-8?q?=EB=B3=84=EC=A0=91=EC=86=8D=ED=86=B5=EA=B3=84=20=EC=BF=BC?=
 =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml     |  8 ++++----
 .../jsp/sym/log/clg/SelectDauLoginLogList.jsp      | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml
index adf729bd..4574060f 100644
--- a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml
@@ -626,7 +626,7 @@
 						    CROSS JOIN (SELECT 0 AS A UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) AS D
 						) A
 					WHERE 1=1
-					AND ( DATE BETWEEN #searchBgnDe# AND #searchEndDe# )
+					AND (DATE BETWEEN #searchBgnDe# AND CONCAT(#searchEndDe#,' 23:59:59'))
 				) A
 				CROSS JOIN
 				( SELECT A.MENU_NM AS menuNm,
@@ -650,7 +650,7 @@
 				    	AND C.AUTHOR_CODE = 'ROLE_ANONYMOUS'
 				    	AND B.URL != '' ) A INNER JOIN LETTNLOGINLOG B ON A.PROGRM_FILE_NM = B.PROGRM_FILE_NM 
 				  	WHERE 1=1
-				  	AND (B.CREAT_DT BETWEEN #searchBgnDe# AND #searchEndDe#)
+				  	AND (B.CREAT_DT BETWEEN #searchBgnDe# AND CONCAT(#searchEndDe#,' 23:59:59'))
 				GROUP BY menuNm , creatDt
 			) D ON  C.creatDt = D.creatDt 
 		AND C.progrmFileNm = D.progrmFileNm
@@ -706,7 +706,7 @@
 				    	AND C.AUTHOR_CODE = 'ROLE_ANONYMOUS'
 				    	AND B.URL != '' ) A INNER JOIN LETTNLOGINLOG B ON A.PROGRM_FILE_NM = B.PROGRM_FILE_NM AND B.CREAT_DT BETWEEN #searchBgnDe# AND #searchEndDe#
 				  	WHERE 1=1
-				  	AND (B.CREAT_DT BETWEEN #searchBgnDe# AND #searchEndDe#)
+				  	AND (B.CREAT_DT BETWEEN #searchBgnDe# AND CONCAT(#searchEndDe#,' 23:59:59'))
 				GROUP BY menuNm , creatDt
 			) D ON  C.creatDt = D.creatDt 
 		AND C.progrmFileNm = D.progrmFileNm
@@ -764,7 +764,7 @@
 				    	AND C.AUTHOR_CODE = 'ROLE_ANONYMOUS'
 				    	AND B.URL != '' ) A INNER JOIN LETTNLOGINLOG B ON A.PROGRM_FILE_NM = B.PROGRM_FILE_NM
 				  	WHERE 1=1
-				  	AND (B.CREAT_DT BETWEEN #searchBgnDe# AND #searchEndDe#)
+				  	AND (B.CREAT_DT BETWEEN #searchBgnDe# AND CONCAT(#searchEndDe#,' 23:59:59'))
 				GROUP BY menuNm , creatDt
 			) D ON  C.creatDt = D.creatDt 
 		AND C.progrmFileNm = D.progrmFileNm
diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectDauLoginLogList.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectDauLoginLogList.jsp
index 5939cf1c..f745db33 100644
--- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectDauLoginLogList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectDauLoginLogList.jsp
@@ -111,15 +111,19 @@ function fnSetCalMonth(val) {
 					<option value="3">3개월</option>
 					<option value="6">6개월</option>
 				</select>
+					
+				<input type="hidden" name="cal_url" id="cal_url" value="<c:url value='/sym/cmm/EgovNormalCalPopup.do'/>" >
+				<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="searchBgnDeYYYMMDD" id="searchBgnDeYYYMMDD" size="4" maxlength="4" readonly=""
+				value="<c:out value="${searchVO.searchBgnDe}" />" >
 				<a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.searchBgnDeYYYMMDD);">
-					<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="searchBgnDeYYYMMDD" id="searchBgnDeYYYMMDD" size="4" maxlength="4" readonly=""
-					value="<c:out value="${searchVO.searchBgnDe}" />" >
 					<input type="button" class="calBtn">
 				</a>
+
 				<span class="line">&nbsp;~</span>
-					<a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.searchEndDeYYYMMDD);">
-					<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="searchEndDeYYYMMDD" id="searchEndDeYYYMMDD" size="4" maxlength="4" readonly=""
-					value="<c:out value="${searchVO.searchEndDe}" />" >
+
+				<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="searchEndDeYYYMMDD" id="searchEndDeYYYMMDD" size="4" maxlength="4" readonly=""
+				value="<c:out value="${searchVO.searchEndDe}" />" >		
+				<a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.searchEndDeYYYMMDD);">
 					<input type="button" class="calBtn">
 				</a>
 				<a href="#" style="margin-left: 17px;" onclick="init_date(); return false;">