From 30041dc7851847e4f346b474ba8045c21dcba64d Mon Sep 17 00:00:00 2001 From: woo Date: Fri, 25 Aug 2023 16:21:12 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=86=B5?= =?UTF-8?q?=EA=B3=84=EA=B4=80=EB=A6=AC=20>=20=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=20=EB=A9=94=EB=89=B4=EB=B3=84=20=EC=A0=91=EC=86=8D=20=ED=86=B5?= =?UTF-8?q?=EA=B3=84=20=EC=86=8D=EB=8F=84=20=EA=B0=9C=EC=84=A0=20=20-=20?= =?UTF-8?q?=EC=B2=AB=20=EB=A1=9C=EB=94=A9=EC=8B=9C=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EA=B8=B0=EA=B0=84=201=EC=A3=BC=EC=9D=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=20-=20=EA=B2=80=EC=83=89=20=EC=BF=BC=EB=A6=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/sym/log/clg/web/EgovLoginLogController.java | 3 +-- .../sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml | 4 ++-- .../webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp | 9 +++++++-- 3 files changed, 10 insertions(+), 6 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 7a372106..4daf4ab1 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 @@ -37,7 +37,6 @@ import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import itn.com.cmm.EgovMessageSource; import itn.com.cmm.LoginVO; import itn.com.cmm.util.RedirectUrlMaker; -import itn.let.mjo.msg.service.MjonMsgVO; import itn.let.sym.log.clg.service.EgovLoginLogService; import itn.let.sym.log.clg.service.LoginLog; import itn.let.sym.log.clg.service.MsgLog; @@ -511,7 +510,7 @@ public class EgovLoginLogController { SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREA); loginLog.setSearchEndDe(date.format(cal.getTime())); //오늘 Calendar mon = Calendar.getInstance(); //한달 전 - mon.add(Calendar.MONTH , -1); + mon.add(Calendar.DATE , -7); String beforeMonth = new java.text.SimpleDateFormat("yyyy-MM-dd").format(mon.getTime()); loginLog.setSearchBgnDe(beforeMonth); } 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 c3b99be3..9fe5d332 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 @@ -647,7 +647,7 @@ SELECT COUNT(B.CREAT_DT) menuCnt, A.MENU_NM AS menuNm, DATE_FORMAT(B.CREAT_DT , "%Y-%m-%d") AS creatDt, A.PROGRM_FILE_NM as progrmFileNm, A.MENU_NO as logId /** 임시정렬번호 */ FROM ( SELECT A.MENU_NM , A.PROGRM_FILE_NM , A.MENU_NO FROM LETTNMENUINFO A INNER JOIN LETTNPROGRMLIST B ON A.PROGRM_FILE_NM = B.PROGRM_FILE_NM INNER JOIN LETTNMENUCREATDTLS C ON C.MENU_NO = A.MENU_NO WHERE B.URL IS NOT NULL 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.URL != '' ) A INNER JOIN LETTNLOGINLOG B ON A.PROGRM_FILE_NM = B.PROGRM_FILE_NM WHERE 1=1 GROUP BY menuNm , creatDt ) D ON C.creatDt = D.creatDt @@ -701,7 +701,7 @@ SELECT COUNT(B.CREAT_DT) menuCnt, A.MENU_NM AS menuNm, DATE_FORMAT(B.CREAT_DT , "%Y-%m") AS creatDt, A.PROGRM_FILE_NM as progrmFileNm, A.MENU_NO as logId /** 임시정렬번호 */ FROM ( SELECT A.MENU_NM , A.PROGRM_FILE_NM , A.MENU_NO FROM LETTNMENUINFO A INNER JOIN LETTNPROGRMLIST B ON A.PROGRM_FILE_NM = B.PROGRM_FILE_NM INNER JOIN LETTNMENUCREATDTLS C ON C.MENU_NO = A.MENU_NO WHERE B.URL IS NOT NULL 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.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 GROUP BY menuNm , creatDt ) D ON C.creatDt = D.creatDt diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp index a7e4c3af..1c0e2bfa 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp @@ -163,7 +163,11 @@ function fnSetCalMonth(val) { var month = ("0"+(today.getMonth()+1)).slice(-2); var date = ("0"+today.getDate()).slice(-2); - var sDate = new Date(today.setMonth(today.getMonth() - val)); + if(val == 'w'){ + var sDate = new Date(today.setDate(today.getDate() - 7)); + }else{ + var sDate = new Date(today.setMonth(today.getMonth() - val)); + } var sYear = sDate.getFullYear(); var sMonth = ("0"+(sDate.getMonth()+1)).slice(-2); @@ -217,7 +221,8 @@ function fnSetCalMonth(val) {