tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'rosewiper'

Browse Source
This commit is contained in:
woo 2023-08-25 16:21:55 +09:00
commit b42b561126
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/itn/let/sym/log/clg/web/EgovLoginLogController.java
View File

@ -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);
}

2
src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml
View File

@ -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

9
src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp
View File

@ -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) {
<select name="setCalMonth" onchange="fnSetCalMonth(this.value)">
<option value="0">전체</option>
<option value="1" selected="selected">1개월</option>
<option value="w" selected="selected">일주일</option>
<option value="1">1개월</option>
<option value="3">3개월</option>
<option value="6">6개월</option>
</select>