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) ; List<?> resultList = userManageService.selectUserList(userSearchVO) ;
model.addAttribute("resultList", resultList); model.addAttribute("resultList", resultList);
//paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((Long)((EgovMap)resultList.get(0)).get("totCnt")).intValue() : 0); //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); model.addAttribute("paginationInfo", paginationInfo);
//권한조회 //권한조회

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

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

62
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"?> <?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"> <sqlMap namespace="SysLog">
@ -183,7 +183,7 @@
APPRO_NM , APPRO_NM ,
#url# #url#
FROM LETTNADMINMETHOD FROM LETTNADMINMETHOD
WHERE METHOD_NM = #methodNm# WHERE LCASE(METHOD_NM) = LCASE(#methodNm#)
<isNotEmpty prepend="AND" property="param"> <isNotEmpty prepend="AND" property="param">
PARAM = #param# PARAM = #param#
</isNotEmpty> </isNotEmpty>
@ -209,10 +209,9 @@
SELECT #requstId# , SELECT #requstId# ,
#rqesterId# , #rqesterId# ,
#rqesterIp# , #rqesterIp# ,
/*
now(), sysdate,
*/
sysdate,
#methodNm#, #methodNm#,
MENU_NM , MENU_NM ,
APPRO_NM , APPRO_NM ,
@ -226,9 +225,7 @@
<isEmpty prepend="AND" property="param"> <isEmpty prepend="AND" property="param">
PARAM = 'N' PARAM = 'N'
</isEmpty> </isEmpty>
<![CDATA[ AND ROWNUM = 1
AND rownum < 2
]]>
</update> </update>
<!-- 시스템 관리자 로그 등록(LETTNADMINMETHOD 테이블에 등록된 것만 insert) --> <!-- 시스템 관리자 로그 등록(LETTNADMINMETHOD 테이블에 등록된 것만 insert) -->
@ -247,10 +244,9 @@
SELECT #requstId# , SELECT #requstId# ,
#rqesterId# , #rqesterId# ,
#rqesterIp# , #rqesterIp# ,
/*
now(), SYSDATE,
*/
sysdate,
#methodNm#, #methodNm#,
'MENU_NM' , 'MENU_NM' ,
'APPRO_NM' , 'APPRO_NM' ,
@ -276,47 +272,15 @@
MAX(REPLACE(admot_id,'ADMOTID_','')*1)+1 MAX(REPLACE(admot_id,'ADMOTID_','')*1)+1
, #methodNm# , #methodNm#
, 'N' , 'N'
/*
, NOW() , SYSDATE
*/
, sysdate
, #trgetMenuNm# , #trgetMenuNm#
, #url# , #url#
, 'N' , 'N'
, 'A' , 'A'
FROM LETTNADMINMETHOD FROM LETTNADMINMETHOD
</update> </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> </sqlMap>

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

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