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

Merge branch 'master' of

Browse Source 
http://tolag3@vcs.iten.co.kr:9999/itnAdmin/fairnet

Conflicts:
	src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Oracle.xml
This commit is contained in:
leejunho 2024-07-24 18:28:09 +09:00
commit 87b9efe72c
4 changed files with 120 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java
View File

@ -207,7 +207,7 @@ public class EgovUserManageController {
List<?> resultList = userManageService.selectUserList(userSearchVO) ;
model.addAttribute("resultList", resultList);
//paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((Long)((EgovMap)resultList.get(0)).get("totCnt")).intValue() : 0);
paginationInfo.setTotalRecordCount( resultList.size()> 0 ? Integer.parseInt(((EgovMap)resultList.get(0)).get("totcnt").toString()) : 0);
paginationInfo.setTotalRecordCount( resultList.size()> 0 ? Integer.parseInt(((EgovMap)resultList.get(0)).get("totCnt").toString()) : 0);
model.addAttribute("paginationInfo", paginationInfo);
//권한조회

17
src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Oracle.xml
View File

@ -27,15 +27,17 @@
<select id="authorManageDAO.selectAuthorList" parameterClass="AuthorManageVO" resultMap="author">
/* authorManageDAO.selectAuthorList */
SELECT * FROM (
SELECT
AUTHOR_CODE, AUTHOR_NM, AUTHOR_DC,
AUTHOR_CODE,
AUTHOR_NM,
AUTHOR_DC,
AUTHOR_CREAT_DE,
/*
TO_CHAR(AUTHOR_CREAT_DE , 'YYYY-MM-DD') AUTHOR_CREAT_DE ,
*/
SORT_NUM
FROM LETTNAUTHORINFO
WHERE 1=1
<![CDATA[
WHERE ROWNUM <= (#firstIndex# + #recordCountPerPage#)
]]>
<isNotEmpty property="authorSet">
AND AUTHOR_SET = #authorSet#
</isNotEmpty>
@ -49,10 +51,7 @@
<isNotEmpty property="searchSortOrd">
$searchSortOrd$
</isNotEmpty>
/*
LIMIT recordCountPerPage OFFSET firstIndex
*/
OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
) WHERE rnum > #firstIndex#
</select>
<insert id="authorManageDAO.insertAuthor" parameterClass="AuthorManage">

58
src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Oracle.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
<sqlMap namespace="SysLog">
@ -183,7 +183,7 @@
APPRO_NM ,
#url#
FROM LETTNADMINMETHOD
WHERE METHOD_NM = #methodNm#
WHERE LCASE(METHOD_NM) = LCASE(#methodNm#)
<isNotEmpty prepend="AND" property="param">
PARAM = #param#
</isNotEmpty>
@ -209,10 +209,9 @@
SELECT #requstId# ,
#rqesterId# ,
#rqesterIp# ,
/*
now(),
*/
sysdate,
#methodNm#,
MENU_NM ,
APPRO_NM ,
@ -226,9 +225,7 @@
<isEmpty prepend="AND" property="param">
PARAM = 'N'
</isEmpty>
<![CDATA[
AND rownum < 2
]]>
AND ROWNUM = 1
</update>
<!-- 시스템 관리자 로그 등록(LETTNADMINMETHOD 테이블에 등록된 것만 insert) -->
@ -247,10 +244,9 @@
SELECT #requstId# ,
#rqesterId# ,
#rqesterIp# ,
/*
now(),
*/
sysdate,
SYSDATE,
#methodNm#,
'MENU_NM' ,
'APPRO_NM' ,
@ -276,10 +272,9 @@
MAX(REPLACE(admot_id,'ADMOTID_','')*1)+1
, #methodNm#
, 'N'
/*
, NOW()
*/
, sysdate
, SYSDATE
, #trgetMenuNm#
, #url#
, 'N'
@ -287,36 +282,5 @@
FROM LETTNADMINMETHOD
</update>
<!-- 시스템 관리자 로그 등록(LETTNADMINMETHOD 테이블에 등록된 것만 insert) 2023-07-11이후 -->
<update id="SysLogDAO.logInsertAdminSysLogNewStep1_bak" parameterClass="sysLog">
/* SysLogDAO.logInsertAdminSysLogNewStep1_bak */
INSERT INTO LETTNADMINLOG_BAK
( ADMINLOG_ID
, CONECT_ID
, CONECT_IP
, CREAT_DT
, PROGRM_FILE_NM
, MENU_NM
, APPRO_NM
, URL
)
SELECT #requstId# ,
#rqesterId# ,
#rqesterIp# ,
now(),
#methodNm#,
MENU_NM ,
APPRO_NM ,
#url#
FROM LETTNADMINMETHOD
WHERE METHOD_NM = #methodNm#
<isNotEmpty prepend="AND" property="param">
PARAM = #param#
</isNotEmpty>
<isEmpty prepend="AND" property="param">
PARAM = 'N'
</isEmpty>
LIMIT 1
</update>
</sqlMap>

20
src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Oracle.xml
View File

@ -21,6 +21,8 @@
<select id="userManageDAO.selectUserList_S" parameterClass="userSearchVO" resultClass="egovMap">
/* userManageDAO.selectUserList_S */
SELECT *
FROM (
SELECT
COUNT(uniqId) OVER() AS "totCnt"
, uniqId AS "uniqId"
@ -39,12 +41,11 @@
, B.AUTHOR_CODE as "authorCode"
, E.AUTHOR_NM as "authorCodeTxt"
, A.emplyrSttusCode AS "emplyrSttusCode"
, F.CODE_NM as "emplyrSttusCodeTxt"
, A.PART_IDX AS "partIdx"
, G.LOC_NM AS "partIdxTxt"
, A.OFCPS_NM AS "ofcpsNm"
, FXNUM AS "fxNum"
, USER_WORK AS "userWork"
, ROWNUM AS rnum
FROM(
SELECT
ESNTL_ID uniqId,
@ -73,12 +74,9 @@
) A LEFT JOIN LETTNEMPLYRSCRTYESTBS B ON A.uniqId = B.SCRTY_DTRMN_TRGET_ID
LEFT JOIN LETTNAUTHORINFO E ON B.AUTHOR_CODE = E.AUTHOR_CODE
LEFT JOIN
( SELECT CODE_NM , CODE FROM LETTCCMMNDETAILCODE WHERE USE_AT = 'Y' /** 회원상태 코드 */
AND CODE_ID = 'COM013'
) F ON A.emplyrSttusCode = F.CODE
LEFT JOIN ITSM_LOC G ON A.PART_IDX = G.LOC_NO
WHERE 1=1
<![CDATA[
WHERE ROWNUM <= (#firstIndex# + #recordCountPerPage#)
]]>
<isNotEqual prepend="AND" property="sbscrbSttus" compareValue="0">
sttus = #sbscrbSttus#
</isNotEqual>
@ -101,10 +99,8 @@
<isNotEmpty property="searchSortOrd">
$searchSortOrd$
</isNotEmpty>
/*
LIMIT recordCountPerPage OFFSET firstIndex
*/
OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
)
WHERE rnum > #firstIndex#
</select>
<select id="userManageDAO.selectUserListTotCnt_S" parameterClass="userSearchVO" resultClass="int">