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

# WARNING: head commit changed in the meantime

Browse Source 
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
This commit is contained in:
myname 2024-10-15 11:07:23 +09:00
parent 08083a67e6
commit 97690f6015
3 changed files with 91 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/seed/com/gtm/base/BaseController.java
View File

@ -286,6 +286,7 @@ public class BaseController {
} }
log.warn(">>>>>>>>params2<<<<<<<<<"+params); log.warn(">>>>>>>>params2<<<<<<<<<"+params);
log.warn(">>>>>>>>params2<<<<<<<<<"+mav.getViewName());
if("ajax".equals(pageName)){ if("ajax".equals(pageName)){
log.warn("===================[[ ajax! ]]================="); log.warn("===================[[ ajax! ]]=================");
mavjson.addAllObjects(params); mavjson.addAllObjects(params);

142
src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Oracle.xml
View File

@ -13,39 +13,49 @@
<!-- 컨텐츠 리스트 --> <!-- 컨텐츠 리스트 -->
<select id="cntManageDAO.selectCntList" parameterClass="cntManageVO" resultClass="cntManageVO"> <select id="cntManageDAO.selectCntList" parameterClass="cntManageVO" resultClass="cntManageVO">
/* cntManageDAO.selectCntList */ /* cntManageDAO.selectCntList */
SELECT A.CNT_ID AS cntId, SELECT *
A.CNTDT_ID AS cntDtId, FROM (
A.CNT_NAME AS cntName,
B.EMPLYR_ID AS registerId, SELECT A.CNT_ID AS cntId,
A.MENU_NO AS menuNo , A.CNTDT_ID AS cntDtId,
/* A.CNT_NAME AS cntName,
IF(C.MENU_NM='root' , '', C.MENU_NM) AS menuNm, B.EMPLYR_ID AS registerId,
*/ A.MENU_NO AS menuNo ,
CASE WHEN C.MENU_NM='root' THEN '' ELSE C.MENU_NM END AS menuNm, /*
TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') registPnttm IF(C.MENU_NM='root' , '', C.MENU_NM) AS menuNm,
FROM CNT_MANAGE A LEFT JOIN LETTNEMPLYRINFO B */
ON A.REGISTER_ID = B.ESNTL_ID CASE WHEN C.MENU_NM='root' THEN '' ELSE C.MENU_NM END AS menuNm,
LEFT OUTER JOIN LETTNMENUINFO C TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') registPnttm
ON A.MENU_NO = C.MENU_NO , ROW_NUMBER () OVER (ORDER BY 1 ,TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') DESC) num
WHERE 1=1 FROM CNT_MANAGE A LEFT JOIN LETTNEMPLYRINFO B
<isNotEmpty property="searchKeyword"> ON A.REGISTER_ID = B.ESNTL_ID
AND CNT_NAME LIKE CONCAT(CONCAT('%', #searchKeyword#), '%') LEFT OUTER JOIN LETTNMENUINFO C
</isNotEmpty> ON A.MENU_NO = C.MENU_NO
<isNotEmpty property="searchConditionSite"> WHERE 1=1
AND A.SITE_ID = #searchConditionSite# <isNotEmpty property="searchKeyword">
</isNotEmpty> AND CNT_NAME LIKE CONCAT(CONCAT('%', #searchKeyword#), '%')
AND A.USE_AT = 'Y' </isNotEmpty>
ORDER BY 1 <isNotEmpty property="searchConditionSite">
<isNotEmpty property="searchSortCnd"> AND A.SITE_ID = #searchConditionSite#
,$searchSortCnd$ </isNotEmpty>
</isNotEmpty> AND A.USE_AT = 'Y'
<isNotEmpty property="searchSortOrd"> ORDER BY 1
$searchSortOrd$ <isNotEmpty property="searchSortCnd">
</isNotEmpty> ,$searchSortCnd$
/* </isNotEmpty>
LIMIT recordCountPerPage OFFSET firstIndex <isNotEmpty property="searchSortOrd">
*/ $searchSortOrd$
OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY </isNotEmpty>
/*
LIMIT recordCountPerPage OFFSET firstIndex
OFFSET firstIndex ROWS FETCH NEXT recordCountPerPage ROWS ONLY
*/
)
WHERE num BETWEEN #firstIndex# + 1 AND #recordCountPerPage#
</select> </select>
<!-- 컨텐츠 리스트 카운트 --> <!-- 컨텐츠 리스트 카운트 -->
@ -95,18 +105,27 @@
<!-- 컨텐츠 상세정보 --> <!-- 컨텐츠 상세정보 -->
<select id="cntManageDAO.selectCntDtDetail" parameterClass="cntManageVO" resultClass="cntManageVO"> <select id="cntManageDAO.selectCntDtDetail" parameterClass="cntManageVO" resultClass="cntManageVO">
/* cntManageDAO.selectCntDtDetail */ /* cntManageDAO.selectCntDtDetail */
SELECT A.CNT_ID cntId, SELECT *
A.CNTDT_ID cntDtId, FROM (
A.CNT_CN cntCn ,
A.CNT_NAME cntName, SELECT A.CNT_ID cntId,
B.EMPLYR_ID registerId, A.CNTDT_ID cntDtId,
TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') registPnttm A.CNT_CN cntCn ,
FROM CNT_MANAGE A LEFT JOIN LETTNEMPLYRINFO B A.CNT_NAME cntName,
ON A.REGISTER_ID = B.ESNTL_ID B.EMPLYR_ID registerId,
WHERE 1=1 TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') registPnttm
AND CNTDT_ID = #cntDtId# FROM CNT_MANAGE A LEFT JOIN LETTNEMPLYRINFO B
/* AND A.USE_AT = 'Y' */ ON A.REGISTER_ID = B.ESNTL_ID
LIMIT 1 WHERE 1=1
AND CNTDT_ID = #cntDtId#
/* AND A.USE_AT = 'Y'
LIMIT 1
*/
)
WHERE 1 >= rownum
</select> </select>
<!-- 수정시 이전 컨텐츠 정보 모두 사용안함'N' 으로 --> <!-- 수정시 이전 컨텐츠 정보 모두 사용안함'N' 으로 -->
@ -171,22 +190,25 @@
<!-- 컨텐츠 상세정보 --> <!-- 컨텐츠 상세정보 -->
<select id="cntManageDAO.selectContentVo" parameterClass="cntManageVO" resultClass="cntManageVO"> <select id="cntManageDAO.selectContentVo" parameterClass="cntManageVO" resultClass="cntManageVO">
/* cntManageDAO.selectContentVo */ /* cntManageDAO.selectContentVo */
SELECT CNTDT_ID cntDtId, SELECT *
CNT_ID cntId, FROM (
CNT_NAME cntName, SELECT CNTDT_ID cntDtId,
(SELECT MENU_NM||'>'||C.MENU_NM FROM LETTNMENUINFO CNT_ID cntId,
WHERE MENU_NO = C.UPPER_MENU_NO ) menu_fullNm, CNT_NAME cntName,
'' as menuCours (SELECT MENU_NM||'>'||C.MENU_NM FROM LETTNMENUINFO
/*getMenuCours(C.MENU_NO) as menuCours*/ WHERE MENU_NO = C.UPPER_MENU_NO ) menu_fullNm,
FROM LETTNPROGRMLIST A INNER JOIN CNT_MANAGE B '' as menuCours
ON A.PROGRM_HTML_FILE_ID = B.CNT_ID /*getMenuCours(C.MENU_NO) as menuCours*/
INNER JOIN LETTNMENUINFO C FROM LETTNPROGRMLIST A INNER JOIN CNT_MANAGE B
ON A.PROGRM_FILE_NM = C.PROGRM_FILE_NM ON A.PROGRM_HTML_FILE_ID = B.CNT_ID
WHERE A.PROGRM_FILE_NM = #progrmFileNm# INNER JOIN LETTNMENUINFO C
AND C.PROGRM_FILE_NM = #progrmFileNm# ON A.PROGRM_FILE_NM = C.PROGRM_FILE_NM
AND B.USE_AT = 'Y' WHERE A.PROGRM_FILE_NM = #progrmFileNm#
AND C.PROGRM_FILE_NM = #progrmFileNm#
AND B.USE_AT = 'Y'
)
WHERE 1 >= rownum
LIMIT 1
</select> </select>
<!-- 컨텐츠 상세정보 --> <!-- 컨텐츠 상세정보 -->

7
src/main/webapp/WEB-INF/jsp/_extra/web/user/news/newsList.jsp
View File

@ -202,6 +202,8 @@
<li><button type="button" class="tab" onclick="pblEvt.tab(this,'active','ul',$('.tab'),'1');">뉴스레터 해지</button></li> <li><button type="button" class="tab" onclick="pblEvt.tab(this,'active','ul',$('.tab'),'1');">뉴스레터 해지</button></li>
</ul> </ul>
<form name="regForm" id="regForm" action="" method="post">
<div class="tab_contents active news_service"> <div class="tab_contents active news_service">
<p class="text_explain">조정원에서 정기적으로 발행하는 뉴스레터 등 다양한 정책 정보를 받기를 원하시는 고객님들은 아래와 같은 입력 사항을 입력하신 후 등록해주시면 정지적으로 뉴스레터가 발송합니다.</p> <p class="text_explain">조정원에서 정기적으로 발행하는 뉴스레터 등 다양한 정책 정보를 받기를 원하시는 고객님들은 아래와 같은 입력 사항을 입력하신 후 등록해주시면 정지적으로 뉴스레터가 발송합니다.</p>
<div class="box gray_fill"> <div class="box gray_fill">
@ -270,6 +272,10 @@
</div> </div>
</div> </div>
</form>
<form name="regForm2" id="regForm2" action="" method="post">
<div class="tab_contents news_service"> <div class="tab_contents news_service">
<p class="text_explain">조정원에서 정기적으로 발행하는 뉴스레터 해지를 원하시는 고객님께서는 정보를 입력해 주세요.</p> <p class="text_explain">조정원에서 정기적으로 발행하는 뉴스레터 해지를 원하시는 고객님께서는 정보를 입력해 주세요.</p>
<div class="box gray_fill"> <div class="box gray_fill">
@ -314,5 +320,6 @@
</div> </div>
</div> </div>
</form>
</div> </div>