# WARNING: head commit changed in the meantime
Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
This commit is contained in:
myname
parent
08083a67e6
commit
97690f6015
@ -286,6 +286,7 @@ public class BaseController {
|
||||
}
|
||||
|
||||
log.warn(">>>>>>>>params2<<<<<<<<<"+params);
|
||||
log.warn(">>>>>>>>params2<<<<<<<<<"+mav.getViewName());
|
||||
if("ajax".equals(pageName)){
|
||||
log.warn("===================[[ ajax! ]]=================");
|
||||
mavjson.addAllObjects(params);
|
||||
|
||||
@ -13,39 +13,49 @@
|
||||
<!-- 컨텐츠 리스트 -->
|
||||
<select id="cntManageDAO.selectCntList" parameterClass="cntManageVO" resultClass="cntManageVO">
|
||||
/* cntManageDAO.selectCntList */
|
||||
SELECT A.CNT_ID AS cntId,
|
||||
A.CNTDT_ID AS cntDtId,
|
||||
A.CNT_NAME AS cntName,
|
||||
B.EMPLYR_ID AS registerId,
|
||||
A.MENU_NO AS menuNo ,
|
||||
/*
|
||||
IF(C.MENU_NM='root' , '', C.MENU_NM) AS menuNm,
|
||||
*/
|
||||
CASE WHEN C.MENU_NM='root' THEN '' ELSE C.MENU_NM END AS menuNm,
|
||||
TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') registPnttm
|
||||
FROM CNT_MANAGE A LEFT JOIN LETTNEMPLYRINFO B
|
||||
ON A.REGISTER_ID = B.ESNTL_ID
|
||||
LEFT OUTER JOIN LETTNMENUINFO C
|
||||
ON A.MENU_NO = C.MENU_NO
|
||||
WHERE 1=1
|
||||
<isNotEmpty property="searchKeyword">
|
||||
AND CNT_NAME LIKE CONCAT(CONCAT('%', #searchKeyword#), '%')
|
||||
</isNotEmpty>
|
||||
<isNotEmpty property="searchConditionSite">
|
||||
AND A.SITE_ID = #searchConditionSite#
|
||||
</isNotEmpty>
|
||||
AND A.USE_AT = 'Y'
|
||||
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 A.CNT_ID AS cntId,
|
||||
A.CNTDT_ID AS cntDtId,
|
||||
A.CNT_NAME AS cntName,
|
||||
B.EMPLYR_ID AS registerId,
|
||||
A.MENU_NO AS menuNo ,
|
||||
/*
|
||||
IF(C.MENU_NM='root' , '', C.MENU_NM) AS menuNm,
|
||||
*/
|
||||
CASE WHEN C.MENU_NM='root' THEN '' ELSE C.MENU_NM END AS menuNm,
|
||||
TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') registPnttm
|
||||
, ROW_NUMBER () OVER (ORDER BY 1 ,TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') DESC) num
|
||||
FROM CNT_MANAGE A LEFT JOIN LETTNEMPLYRINFO B
|
||||
ON A.REGISTER_ID = B.ESNTL_ID
|
||||
LEFT OUTER JOIN LETTNMENUINFO C
|
||||
ON A.MENU_NO = C.MENU_NO
|
||||
WHERE 1=1
|
||||
<isNotEmpty property="searchKeyword">
|
||||
AND CNT_NAME LIKE CONCAT(CONCAT('%', #searchKeyword#), '%')
|
||||
</isNotEmpty>
|
||||
<isNotEmpty property="searchConditionSite">
|
||||
AND A.SITE_ID = #searchConditionSite#
|
||||
</isNotEmpty>
|
||||
AND A.USE_AT = 'Y'
|
||||
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
|
||||
*/
|
||||
|
||||
)
|
||||
WHERE num BETWEEN #firstIndex# + 1 AND #recordCountPerPage#
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
<!-- 컨텐츠 리스트 카운트 -->
|
||||
@ -95,18 +105,27 @@
|
||||
<!-- 컨텐츠 상세정보 -->
|
||||
<select id="cntManageDAO.selectCntDtDetail" parameterClass="cntManageVO" resultClass="cntManageVO">
|
||||
/* cntManageDAO.selectCntDtDetail */
|
||||
SELECT A.CNT_ID cntId,
|
||||
A.CNTDT_ID cntDtId,
|
||||
A.CNT_CN cntCn ,
|
||||
A.CNT_NAME cntName,
|
||||
B.EMPLYR_ID registerId,
|
||||
TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') registPnttm
|
||||
FROM CNT_MANAGE A LEFT JOIN LETTNEMPLYRINFO B
|
||||
ON A.REGISTER_ID = B.ESNTL_ID
|
||||
WHERE 1=1
|
||||
AND CNTDT_ID = #cntDtId#
|
||||
/* AND A.USE_AT = 'Y' */
|
||||
LIMIT 1
|
||||
SELECT *
|
||||
FROM (
|
||||
|
||||
SELECT A.CNT_ID cntId,
|
||||
A.CNTDT_ID cntDtId,
|
||||
A.CNT_CN cntCn ,
|
||||
A.CNT_NAME cntName,
|
||||
B.EMPLYR_ID registerId,
|
||||
TO_CHAR(A.REGIST_PNTTM , 'YYYY-MM-DD HH24') registPnttm
|
||||
FROM CNT_MANAGE A LEFT JOIN LETTNEMPLYRINFO B
|
||||
ON A.REGISTER_ID = B.ESNTL_ID
|
||||
WHERE 1=1
|
||||
AND CNTDT_ID = #cntDtId#
|
||||
/* AND A.USE_AT = 'Y'
|
||||
LIMIT 1
|
||||
*/
|
||||
|
||||
)
|
||||
WHERE 1 >= rownum
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
<!-- 수정시 이전 컨텐츠 정보 모두 사용안함'N' 으로 -->
|
||||
@ -171,22 +190,25 @@
|
||||
<!-- 컨텐츠 상세정보 -->
|
||||
<select id="cntManageDAO.selectContentVo" parameterClass="cntManageVO" resultClass="cntManageVO">
|
||||
/* cntManageDAO.selectContentVo */
|
||||
SELECT CNTDT_ID cntDtId,
|
||||
CNT_ID cntId,
|
||||
CNT_NAME cntName,
|
||||
(SELECT MENU_NM||'>'||C.MENU_NM FROM LETTNMENUINFO
|
||||
WHERE MENU_NO = C.UPPER_MENU_NO ) menu_fullNm,
|
||||
'' as menuCours
|
||||
/*getMenuCours(C.MENU_NO) as menuCours*/
|
||||
FROM LETTNPROGRMLIST A INNER JOIN CNT_MANAGE B
|
||||
ON A.PROGRM_HTML_FILE_ID = B.CNT_ID
|
||||
INNER JOIN LETTNMENUINFO C
|
||||
ON A.PROGRM_FILE_NM = C.PROGRM_FILE_NM
|
||||
WHERE A.PROGRM_FILE_NM = #progrmFileNm#
|
||||
AND C.PROGRM_FILE_NM = #progrmFileNm#
|
||||
AND B.USE_AT = 'Y'
|
||||
SELECT *
|
||||
FROM (
|
||||
SELECT CNTDT_ID cntDtId,
|
||||
CNT_ID cntId,
|
||||
CNT_NAME cntName,
|
||||
(SELECT MENU_NM||'>'||C.MENU_NM FROM LETTNMENUINFO
|
||||
WHERE MENU_NO = C.UPPER_MENU_NO ) menu_fullNm,
|
||||
'' as menuCours
|
||||
/*getMenuCours(C.MENU_NO) as menuCours*/
|
||||
FROM LETTNPROGRMLIST A INNER JOIN CNT_MANAGE B
|
||||
ON A.PROGRM_HTML_FILE_ID = B.CNT_ID
|
||||
INNER JOIN LETTNMENUINFO C
|
||||
ON A.PROGRM_FILE_NM = C.PROGRM_FILE_NM
|
||||
WHERE A.PROGRM_FILE_NM = #progrmFileNm#
|
||||
AND C.PROGRM_FILE_NM = #progrmFileNm#
|
||||
AND B.USE_AT = 'Y'
|
||||
)
|
||||
WHERE 1 >= rownum
|
||||
|
||||
LIMIT 1
|
||||
</select>
|
||||
|
||||
<!-- 컨텐츠 상세정보 -->
|
||||
|
||||
@ -202,6 +202,8 @@
|
||||
<li><button type="button" class="tab" onclick="pblEvt.tab(this,'active','ul',$('.tab'),'1');">뉴스레터 해지</button></li>
|
||||
</ul>
|
||||
|
||||
<form name="regForm" id="regForm" action="" method="post">
|
||||
|
||||
<div class="tab_contents active news_service">
|
||||
<p class="text_explain">조정원에서 정기적으로 발행하는 뉴스레터 등 다양한 정책 정보를 받기를 원하시는 고객님들은 아래와 같은 입력 사항을 입력하신 후 등록해주시면 정지적으로 뉴스레터가 발송합니다.</p>
|
||||
<div class="box gray_fill">
|
||||
@ -270,6 +272,10 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
<form name="regForm2" id="regForm2" action="" method="post">
|
||||
|
||||
<div class="tab_contents news_service">
|
||||
<p class="text_explain">조정원에서 정기적으로 발행하는 뉴스레터 해지를 원하시는 고객님께서는 정보를 입력해 주세요.</p>
|
||||
<div class="box gray_fill">
|
||||
@ -314,5 +320,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user