From 6360aba168991c96bfcdbb4ea5c5c986bf4b6b8d Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Wed, 13 Sep 2023 12:54:54 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=EB=B0=A9=EB=AC=B8?=
 =?UTF-8?q?=EC=88=98=20=EA=B4=80=EB=A6=AC=20=EC=BF=BC=EB=A6=AC=20=EC=84=B1?=
 =?UTF-8?q?=EB=8A=A5=EA=B0=9C=EC=84=A0,=20=EA=B8=B0=EA=B0=84=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=20=EC=8B=9C=EC=9E=91=EC=9D=BC=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=EA=B0=92=20=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/clg/web/EgovLoginLogController.java   |  7 ++++
 .../sym/log/clg/EgovLoginLog_SQL_Mysql.xml    | 32 +++++++++----------
 .../jsp/sym/log/clg/EgovLoginLogGroupList.jsp |  2 +-
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/main/java/itn/let/sym/log/clg/web/EgovLoginLogController.java b/src/main/java/itn/let/sym/log/clg/web/EgovLoginLogController.java
index 33cff6a9..115f1a4f 100644
--- a/src/main/java/itn/let/sym/log/clg/web/EgovLoginLogController.java
+++ b/src/main/java/itn/let/sym/log/clg/web/EgovLoginLogController.java
@@ -172,6 +172,13 @@ public class EgovLoginLogController {
 				loginLog.setSearchEndDate(toDay);			
 			}
 		}
+		
+		// 기간검색 설정
+    	String beforeMonthDay = MJUtil.getBefore1MonthDate();	//한달 전        
+    	if (null == loginLog.getSearchStartDate() || loginLog.getSearchStartDate().equals("")) {
+    		loginLog.setSearchStartDate(beforeMonthDay);
+    	}						
+		
 		List<LoginLog> adminLogList  = loginLogService.selectAdminGroupLog(loginLog);
 		int adminLogListCnt = loginLogService.selectAdminGroupLogTotCnt(loginLog);
 		paginationInfo.setTotalRecordCount(adminLogListCnt);
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 1c192283..ec63bb81 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
@@ -287,7 +287,7 @@
 			</isNotEmpty>
 			<isNotEmpty prepend="AND" property="searchEndDate">
 				<![CDATA[ 
-					a.CREAT_DT <= DATE_ADD(DATE_FORMAT(#searchEndDate#, '%Y-%m-%d'), INTERVAL 1 DAY)  
+					a.CREAT_DT < DATE_ADD(DATE_FORMAT(#searchEndDate#, '%Y-%m-%d'), INTERVAL 1 DAY)  
 				]]>
 			</isNotEmpty>            
         ORDER BY 1=1
@@ -329,7 +329,7 @@
 			</isNotEmpty>
 			<isNotEmpty prepend="AND" property="searchEndDate">
 				<![CDATA[ 
-					a.CREAT_DT <= DATE_ADD(DATE_FORMAT(#searchEndDate#, '%Y-%m-%d'), INTERVAL 1 DAY)  
+					a.CREAT_DT < DATE_ADD(DATE_FORMAT(#searchEndDate#, '%Y-%m-%d'), INTERVAL 1 DAY)  
 				]]>
 			</isNotEmpty>                        
 	</select>
@@ -338,20 +338,19 @@
 	<select id="LoginLogDAO.selectAdminGroupLog" parameterClass="loginLog" resultClass="loginLog">
 		SELECT
 	       	a.ADMINLOG_ID 	logId ,
-	       	b.USER_NM 	loginNm,
+	       	c.USER_NM 	loginNm,
 	       	DATE_FORMAT(a.CREAT_DT, '%Y-%m-%d' )   creatDt,
 	       	a.CONECT_IP 	loginIp,
 	       	a.PROGRM_FILE_NM AS progrmFileNm,
         	a.MENU_NM AS menuNm,
         	a.APPRO_NM AS approNm,
-        	b.USER_ID AS loginId,
+        	c.EMPLYR_ID AS loginId,
         	a.URL AS url,
         	count(0) AS visitCnt
 	    FROM
-	        LETTNADMINLOG a INNER JOIN COMVNUSERMASTER b       
-	        ON a.CONECT_ID = b.ESNTL_ID   
+	        LETTNADMINLOG a
 	        INNER JOIN lettnemplyrinfo c
-	        ON b.USER_ID = c.EMPLYR_ID	            	            
+	        ON a.CONECT_ID = c.ESNTL_ID
 	    WHERE 1=1 
 	        AND a.CONECT_ID != ''
 			<isNotEmpty property="searchKeyword">
@@ -365,14 +364,14 @@
 				 	b.USER_NM LIKE CONCAT('%' , #searchKeyword#, '%')
                 </isEqual>
             </isNotEmpty>
-	        <isNotEmpty prepend="AND" property="searchStartDate">
+			<isNotEmpty prepend="AND" property="searchStartDate">
 				<![CDATA[ 
-					DATE_FORMAT(a.CREAT_DT, '%Y-%m-%d') >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
+					a.CREAT_DT >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
 				]]>
 			</isNotEmpty>
 			<isNotEmpty prepend="AND" property="searchEndDate">
 				<![CDATA[ 
-					DATE_FORMAT(a.CREAT_DT, '%Y-%m-%d') <= DATE_FORMAT(#searchEndDate#, '%Y-%m-%d')  
+					a.CREAT_DT < DATE_ADD(DATE_FORMAT(#searchEndDate#, '%Y-%m-%d'), INTERVAL 1 DAY)  
 				]]>
 			</isNotEmpty>            
             GROUP BY DATE_FORMAT(a.CREAT_DT, '%Y-%m-%d'), a.CONECT_ID
@@ -392,10 +391,9 @@
 		    SELECT
 	        	a.ADMINLOG_ID             
 		    FROM
-		        LETTNADMINLOG a INNER JOIN COMVNUSERMASTER b       
-		        ON a.CONECT_ID = b.ESNTL_ID 
+		        LETTNADMINLOG a
 		        INNER JOIN lettnemplyrinfo c
-		        ON b.USER_ID = c.EMPLYR_ID	            	              
+		        ON a.CONECT_ID = c.ESNTL_ID
 		    WHERE 1=1 
 		        AND a.CONECT_ID != '' 
 				<isNotEmpty property="searchKeyword">
@@ -409,16 +407,16 @@
 					 	b.USER_NM LIKE CONCAT('%' , #searchKeyword#, '%')
 	                </isEqual>
 	            </isNotEmpty>
-		        <isNotEmpty prepend="AND" property="searchStartDate">
+				<isNotEmpty prepend="AND" property="searchStartDate">
 					<![CDATA[ 
-						DATE_FORMAT(a.CREAT_DT, '%Y-%m-%d') >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
+						a.CREAT_DT >= DATE_FORMAT(#searchStartDate#, '%Y-%m-%d')
 					]]>
 				</isNotEmpty>
 				<isNotEmpty prepend="AND" property="searchEndDate">
 					<![CDATA[ 
-						DATE_FORMAT(a.CREAT_DT, '%Y-%m-%d') <= DATE_FORMAT(#searchEndDate#, '%Y-%m-%d')  
+						a.CREAT_DT < DATE_ADD(DATE_FORMAT(#searchEndDate#, '%Y-%m-%d'), INTERVAL 1 DAY)  
 					]]>
-				</isNotEmpty>            	            
+				</isNotEmpty>            
 	        GROUP BY DATE_FORMAT(a.CREAT_DT, '%Y-%m-%d'), a.CONECT_ID
 	    ) M
 	</select>
diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogGroupList.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogGroupList.jsp
index c696e1f4..4e49d71a 100644
--- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogGroupList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogGroupList.jsp
@@ -210,7 +210,7 @@ function getYesterday() {
 				<div class="rightWrap">
 					<input type="button" style="cursor: pointer;" onclick="setYesterday();" value="어제">
 					<input type="button" style="cursor: pointer;" onclick="setToday();" value="오늘">
-					<input type="button" style="cursor: pointer;" onclick="setStart();" value="전체">
+					<input type="button" style="cursor: pointer;" onclick="setStart();" value="초기화">
 				
 					<select name="pageUnit" id="pageUnit" class="select" title="검색조건선택" onchange="linkPage(1);">
 					   <option value='10' <c:if test="${searchVO.pageUnit == '10' or searchVO.pageUnit == ''}">selected</c:if>>10줄</option>