Merge branch 'master' of

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

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);
//권한조회

View File

@ -26,33 +26,32 @@
</resultMap>
<select id="authorManageDAO.selectAuthorList" parameterClass="AuthorManageVO" resultMap="author">
/* authorManageDAO.selectAuthorList */
SELECT
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
<isNotEmpty property="authorSet">
AND AUTHOR_SET = #authorSet#
</isNotEmpty>
<isEqual prepend="AND" property="searchCondition" compareValue="1">
AUTHOR_NM LIKE '%'||#searchKeyword#||'%'
</isEqual>
ORDER BY 1
<isNotEmpty property="searchSortCnd">
,$searchSortCnd$
</isNotEmpty>
<isNotEmpty property="searchSortOrd">
$searchSortOrd$
</isNotEmpty>
/*
LIMIT recordCountPerPage OFFSET firstIndex
*/
OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
/* authorManageDAO.selectAuthorList */
SELECT * FROM (
SELECT
AUTHOR_CODE,
AUTHOR_NM,
AUTHOR_DC,
AUTHOR_CREAT_DE,
SORT_NUM
FROM LETTNAUTHORINFO
<![CDATA[
WHERE ROWNUM <= (#firstIndex# + #recordCountPerPage#)
]]>
<isNotEmpty property="authorSet">
AND AUTHOR_SET = #authorSet#
</isNotEmpty>
<isEqual prepend="AND" property="searchCondition" compareValue="1">
AUTHOR_NM LIKE '%'||#searchKeyword#||'%'
</isEqual>
ORDER BY 1
<isNotEmpty property="searchSortCnd">
,$searchSortCnd$
</isNotEmpty>
<isNotEmpty property="searchSortOrd">
$searchSortOrd$
</isNotEmpty>
) WHERE rnum > #firstIndex#
</select>
<insert id="authorManageDAO.insertAuthor" parameterClass="AuthorManage">

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,
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,47 +272,15 @@
MAX(REPLACE(admot_id,'ADMOTID_','')*1)+1
, #methodNm#
, 'N'
/*
, NOW()
*/
, sysdate
, SYSDATE
, #trgetMenuNm#
, #url#
, 'N'
, 'A'
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>

View File

@ -21,90 +21,86 @@
<select id="userManageDAO.selectUserList_S" parameterClass="userSearchVO" resultClass="egovMap">
/* userManageDAO.selectUserList_S */
SELECT
COUNT(uniqId) OVER() AS "totCnt"
, uniqId AS "uniqId"
, userTy AS "userTy"
, userId AS "userId"
, userNm AS "userNm"
, emailAdres AS "emailAdres"
, areaNo AS "areaNo"
, middleTelno AS "middleTelno"
, endTelno AS "endTelno"
, moblphonNo AS "moblphonNo"
, groupId AS "groupId"
, sttus AS "sttus"
, offmTelno AS "offmTelno"
, TO_CHAR(sbscrbDe, 'YYYY-MM-DD') AS "sbscrbDe"
, 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"
FROM(
SELECT
ESNTL_ID uniqId,
'USR03' userTy,
EMPLYR_ID userId,
USER_NM userNm,
EMAIL_ADRES emailAdres,
AREA_NO areaNo,
HOUSE_MIDDLE_TELNO middleTelno,
HOUSE_END_TELNO endTelno,
MBTLNUM moblphonNo,
GROUP_ID groupId,
EMPLYR_STTUS_CODE sttus,
OFFM_TELNO offmTelno,
SBSCRB_DE sbscrbDe,
C.EMPLYR_STTUS_CODE AS emplyrSttusCode,
PART_IDX,
OFCPS_NM,
FXNUM ,
USER_WORK
FROM LETTNEMPLYRINFO C
WHERE 1=1
<isNotEmpty property="emplyrSttusCode">
AND C.EMPLYR_STTUS_CODE = #emplyrSttusCode#
</isNotEmpty>
) 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
<isNotEqual prepend="AND" property="sbscrbSttus" compareValue="0">
sttus = #sbscrbSttus#
</isNotEqual>
<isEqual prepend="AND" property="searchCondition" compareValue="0">
userId LIKE '%'||#searchKeyword#||'%'
</isEqual>
<isEqual prepend="AND" property="searchCondition" compareValue="1">
userNm LIKE '%'||#searchKeyword#||'%'
</isEqual>
<isEqual prepend="AND" property="searchCondition" compareValue="">
( userNm LIKE '%'||#searchKeyword#||'%' OR userId LIKE '%'||#searchKeyword#||'%')
</isEqual>
<isNotEmpty property="searchConditionSite">
AND A.siteId = #searchConditionSite#
</isNotEmpty>
ORDER BY 1
<isNotEmpty property="searchSortCnd">
,$searchSortCnd$
</isNotEmpty>
<isNotEmpty property="searchSortOrd">
$searchSortOrd$
</isNotEmpty>
/*
LIMIT recordCountPerPage OFFSET firstIndex
*/
OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
SELECT *
FROM (
SELECT
COUNT(uniqId) OVER() AS "totCnt"
, uniqId AS "uniqId"
, userTy AS "userTy"
, userId AS "userId"
, userNm AS "userNm"
, emailAdres AS "emailAdres"
, areaNo AS "areaNo"
, middleTelno AS "middleTelno"
, endTelno AS "endTelno"
, moblphonNo AS "moblphonNo"
, groupId AS "groupId"
, sttus AS "sttus"
, offmTelno AS "offmTelno"
, TO_CHAR(sbscrbDe, 'YYYY-MM-DD') AS "sbscrbDe"
, B.AUTHOR_CODE as "authorCode"
, E.AUTHOR_NM as "authorCodeTxt"
, A.emplyrSttusCode AS "emplyrSttusCode"
, A.PART_IDX AS "partIdx"
, A.OFCPS_NM AS "ofcpsNm"
, FXNUM AS "fxNum"
, USER_WORK AS "userWork"
, ROWNUM AS rnum
FROM(
SELECT
ESNTL_ID uniqId,
'USR03' userTy,
EMPLYR_ID userId,
USER_NM userNm,
EMAIL_ADRES emailAdres,
AREA_NO areaNo,
HOUSE_MIDDLE_TELNO middleTelno,
HOUSE_END_TELNO endTelno,
MBTLNUM moblphonNo,
GROUP_ID groupId,
EMPLYR_STTUS_CODE sttus,
OFFM_TELNO offmTelno,
SBSCRB_DE sbscrbDe,
C.EMPLYR_STTUS_CODE AS emplyrSttusCode,
PART_IDX,
OFCPS_NM,
FXNUM ,
USER_WORK
FROM LETTNEMPLYRINFO C
WHERE 1=1
<isNotEmpty property="emplyrSttusCode">
AND C.EMPLYR_STTUS_CODE = #emplyrSttusCode#
</isNotEmpty>
) A LEFT JOIN LETTNEMPLYRSCRTYESTBS B ON A.uniqId = B.SCRTY_DTRMN_TRGET_ID
LEFT JOIN LETTNAUTHORINFO E ON B.AUTHOR_CODE = E.AUTHOR_CODE
<![CDATA[
WHERE ROWNUM <= (#firstIndex# + #recordCountPerPage#)
]]>
<isNotEqual prepend="AND" property="sbscrbSttus" compareValue="0">
sttus = #sbscrbSttus#
</isNotEqual>
<isEqual prepend="AND" property="searchCondition" compareValue="0">
userId LIKE '%'||#searchKeyword#||'%'
</isEqual>
<isEqual prepend="AND" property="searchCondition" compareValue="1">
userNm LIKE '%'||#searchKeyword#||'%'
</isEqual>
<isEqual prepend="AND" property="searchCondition" compareValue="">
( userNm LIKE '%'||#searchKeyword#||'%' OR userId LIKE '%'||#searchKeyword#||'%')
</isEqual>
<isNotEmpty property="searchConditionSite">
AND A.siteId = #searchConditionSite#
</isNotEmpty>
ORDER BY 1
<isNotEmpty property="searchSortCnd">
,$searchSortCnd$
</isNotEmpty>
<isNotEmpty property="searchSortOrd">
$searchSortOrd$
</isNotEmpty>
)
WHERE rnum > #firstIndex#
</select>
<select id="userManageDAO.selectUserListTotCnt_S" parameterClass="userSearchVO" resultClass="int">