--- src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Mysql.xml
... | ... | @@ -274,7 +274,7 @@ |
| 274 | 274 |
<![CDATA[ |
| 275 | 275 |
AND ( ( a.NOTICE_AT != 'Y' or a.NOTICE_AT is null) |
| 276 | 276 |
OR ( NTCE_BGNDE is null or NTCE_BGNDE ='') |
| 277 |
- OR ( DATE_FORMAT(now(), '%Y%m%d%H%i') < NTCE_BGNDE OR DATE_FORMAT(now(), '%Y%m%d%H%i') > NTCE_ENDDE ) |
|
| 277 |
+ OR ( DATE_FORMAT(now(), '%Y%m%d%H%i') < NTCE_BGNDE OR DATE_FORMAT(now(), '%Y%m%d%H%i') >= NTCE_ENDDE ) |
|
| 278 | 278 |
) |
| 279 | 279 |
]]> |
| 280 | 280 |
</isEqual> |
... | ... | @@ -327,7 +327,7 @@ |
| 327 | 327 |
<![CDATA[ |
| 328 | 328 |
AND ( ( a.NOTICE_AT != 'Y' or a.NOTICE_AT is null) |
| 329 | 329 |
OR ( NTCE_BGNDE is null or NTCE_BGNDE ='') |
| 330 |
- OR ( DATE_FORMAT(now(), '%Y%m%d%H%i') < NTCE_BGNDE OR DATE_FORMAT(now(), '%Y%m%d%H%i') > NTCE_ENDDE ) |
|
| 330 |
+ OR ( DATE_FORMAT(now(), '%Y%m%d%H%i') < NTCE_BGNDE OR DATE_FORMAT(now(), '%Y%m%d%H%i') >= NTCE_ENDDE ) |
|
| 331 | 331 |
) |
| 332 | 332 |
]]> |
| 333 | 333 |
</isEqual> |
... | ... | @@ -411,7 +411,7 @@ |
| 411 | 411 |
<![CDATA[ |
| 412 | 412 |
AND ( ( a.NOTICE_AT != 'Y' or a.NOTICE_AT is null) |
| 413 | 413 |
OR ( NTCE_BGNDE is null or NTCE_BGNDE ='') |
| 414 |
- OR ( DATE_FORMAT(now(), '%Y%m%d%H%i') < NTCE_BGNDE OR DATE_FORMAT(now(), '%Y%m%d%H%i') > NTCE_ENDDE ) |
|
| 414 |
+ OR ( DATE_FORMAT(now(), '%Y%m%d%H%i') < NTCE_BGNDE OR DATE_FORMAT(now(), '%Y%m%d%H%i') >= NTCE_ENDDE ) |
|
| 415 | 415 |
) |
| 416 | 416 |
]]> |
| 417 | 417 |
</isEqual> |
... | ... | @@ -672,7 +672,7 @@ |
| 672 | 672 |
<![CDATA[ |
| 673 | 673 |
AND ( ( a.NOTICE_AT != 'Y' or a.NOTICE_AT is null) |
| 674 | 674 |
OR ( NTCE_BGNDE is null or NTCE_BGNDE ='') |
| 675 |
- OR ( DATE_FORMAT(now(), '%Y%m%d%H%i') < NTCE_BGNDE OR DATE_FORMAT(now(), '%Y%m%d%H%i') > NTCE_ENDDE ) |
|
| 675 |
+ OR ( DATE_FORMAT(now(), '%Y%m%d%H%i') < NTCE_BGNDE OR DATE_FORMAT(now(), '%Y%m%d%H%i') >= NTCE_ENDDE ) |
|
| 676 | 676 |
) |
| 677 | 677 |
]]> |
| 678 | 678 |
</isEqual> |
... | ... | @@ -906,7 +906,7 @@ |
| 906 | 906 |
|
| 907 | 907 |
<select id="BBSManageDAO.selectBoardNotifyArticleList" parameterClass="BoardVO" resultMap="boardList" > |
| 908 | 908 |
SELECT |
| 909 |
- a.NTT_ID, a.NTT_SJ, SUBSTR(a.NTT_CN, 1, 2000) AS NTT_CN, a.FRST_REGISTER_ID, IFNULL(b.USER_NM, a.NTCR_NM) as FRST_REGISTER_NM, |
|
| 909 |
+ a.NTT_ID, a.NTT_SJ, SUBSTR(a.NTT_CN, 1, 2000) AS NTT_CN, a.FRST_REGISTER_ID, a.NTCR_NM as FRST_REGISTER_NM, |
|
| 910 | 910 |
DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d') as FRST_REGIST_PNTTM, |
| 911 | 911 |
a.RDCNT, a.PARNTSCTT_NO, a.ANSWER_AT, a.ANSWER_LC, a.USE_AT, a.ATCH_FILE_ID, |
| 912 | 912 |
a.BBS_ID, a.NTCE_BGNDE, a.NTCE_ENDDE, a.NOTICE_AT, a.SECRET_AT |
... | ... | @@ -939,7 +939,7 @@ |
| 939 | 939 |
a.BBS_ID = #bbsId# |
| 940 | 940 |
AND a.NOTICE_AT = 'Y' |
| 941 | 941 |
<![CDATA[ |
| 942 |
- AND ( DATE_FORMAT(now(), '%Y%m%d%H%i') > NTCE_BGNDE AND DATE_FORMAT(now(), '%Y%m%d%H%i') < NTCE_ENDDE ) |
|
| 942 |
+ AND ( DATE_FORMAT(now(), '%Y%m%d%H%i') >= NTCE_BGNDE AND DATE_FORMAT(now(), '%Y%m%d%H%i') < NTCE_ENDDE ) |
|
| 943 | 943 |
]]> |
| 944 | 944 |
AND a.USE_AT = 'Y' |
| 945 | 945 |
<isEqual prepend="AND" property="searchCnd" compareValue=""> |
--- src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp
+++ src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp
... | ... | @@ -316,7 +316,7 @@ |
| 316 | 316 |
<form:errors path="replyPosblAt" cssClass="error" /> |
| 317 | 317 |
</td> |
| 318 | 318 |
</tr> |
| 319 |
- <tr> |
|
| 319 |
+ <tr style="display:none;"> |
|
| 320 | 320 |
<th>답변댓글기능</th> |
| 321 | 321 |
<td> |
| 322 | 322 |
<form:select path="addYn" title="댓글기능 선택" class="sel2"> |
+++ src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeAtRow.jsp
... | ... | @@ -0,0 +1,74 @@ |
| 1 | +<%-- | |
| 2 | + 게시글 등록/수정 화면 공통 : 공지 여부 + 공지 기간 입력 행 | |
| 3 | + - 게시판 설정의 공지기능(noticeYn)이 'Y' 인 경우에만 노출 | |
| 4 | + - 저장 시 fn_egov_regist_notice() 에서 ntceBgnde / ntceEndde (yyyyMMddHHmm) hidden 값으로 변환 | |
| 5 | +--%> | |
| 6 | +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> | |
| 7 | +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> | |
| 8 | +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> | |
| 9 | +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> | |
| 10 | +<c:if test="${bdMstr.noticeYn == 'Y'}"> | |
| 11 | + <c:set var="_bg" value="${board.ntceBgnde}"/> | |
| 12 | + <c:set var="_ed" value="${board.ntceEndde}"/> | |
| 13 | + <jsp:useBean id="_now" class="java.util.Date"/> | |
| 14 | + <fmt:formatDate var="_today" value="${_now}" pattern="yyyy-MM-dd"/> | |
| 15 | + <c:set var="_bgDate" value="${fn:length(_bg) ge 8 ? fn:substring(_bg,0,4).concat('-').concat(fn:substring(_bg,4,6)).concat('-').concat(fn:substring(_bg,6,8)) : _today}"/> | |
| 16 | + <c:set var="_edDate" value="${fn:length(_ed) ge 8 ? fn:substring(_ed,0,4).concat('-').concat(fn:substring(_ed,4,6)).concat('-').concat(fn:substring(_ed,6,8)) : ''}"/> | |
| 17 | + <c:set var="_bgHH" value="${fn:length(_bg) ge 10 ? fn:substring(_bg,8,10) : '00'}"/> | |
| 18 | + <c:set var="_bgMM" value="${fn:length(_bg) ge 12 ? fn:substring(_bg,10,12) : '00'}"/> | |
| 19 | + <c:set var="_edHH" value="${fn:length(_ed) ge 10 ? fn:substring(_ed,8,10) : '23'}"/> | |
| 20 | + <c:set var="_edMM" value="${fn:length(_ed) ge 12 ? fn:substring(_ed,10,12) : '59'}"/> | |
| 21 | + <%-- 기한 없음 : 기본값. 기존 공지글은 종료일이 9999년이거나 기간이 없으면 기한 없음으로 표시 --%> | |
| 22 | + <c:set var="_unlimited" value="${board.noticeAt ne 'Y' or fn:length(_ed) lt 8 or fn:startsWith(_ed, '9999')}"/> | |
| 23 | + <c:if test="${_unlimited}"> | |
| 24 | + <c:set var="_bgDate" value="${_today}"/><c:set var="_bgHH" value="00"/><c:set var="_bgMM" value="00"/> | |
| 25 | + <c:set var="_edDate" value=""/><c:set var="_edHH" value="23"/><c:set var="_edMM" value="59"/> | |
| 26 | + </c:if> | |
| 27 | + <tr> | |
| 28 | + <th>공지여부</th> | |
| 29 | + <td> | |
| 30 | + <label style="margin-right:20px;"> | |
| 31 | + <input type="checkbox" name="noticeAt" id="noticeAt" value="Y" style="margin-right:5px;" <c:if test="${board.noticeAt eq 'Y'}">checked="checked"</c:if> />공지로 등록 | |
| 32 | + </label> | |
| 33 | + <span class="notice_unlimited_wrap" style="margin-right:20px;"> | |
| 34 | + <label style="margin-right:12px;"> | |
| 35 | + <input type="radio" name="ntcePeriodType" id="ntceUnlimited" value="N" style="margin-right:5px;" <c:if test="${_unlimited}">checked="checked"</c:if> />기한 없음 | |
| 36 | + </label> | |
| 37 | + <label> | |
| 38 | + <input type="radio" name="ntcePeriodType" id="ntcePeriodSet" value="P" style="margin-right:5px;" <c:if test="${not _unlimited}">checked="checked"</c:if> />기간 지정 | |
| 39 | + </label> | |
| 40 | + </span> | |
| 41 | + <span class="notice_period"> | |
| 42 | + <input type="date" id="ntceBgndeYYYMMDD" class="input" style="width:auto;" value="${_bgDate}" /> | |
| 43 | + <select id="ntceBgndeHH" class="sel" style="width:auto;"> | |
| 44 | + <c:forEach var="t" items="${ntceBgndeHH}"><c:if test="${t.code ne '24'}"><option value="${t.code}" <c:if test="${t.code eq _bgHH}">selected="selected"</c:if>>${t.codeNm}</option></c:if></c:forEach> | |
| 45 | + </select>시 | |
| 46 | + <select id="ntceBgndeMM" class="sel" style="width:auto;"> | |
| 47 | + <c:forEach var="t" items="${ntceBgndeMM}"><c:if test="${t.code ne '60'}"><option value="${t.code}" <c:if test="${t.code eq _bgMM}">selected="selected"</c:if>>${t.codeNm}</option></c:if></c:forEach> | |
| 48 | + </select>분 | |
| 49 | + ~ | |
| 50 | + <input type="date" id="ntceEnddeYYYMMDD" class="input" style="width:auto;" value="${_edDate}" /> | |
| 51 | + <select id="ntceEnddeHH" class="sel" style="width:auto;"> | |
| 52 | + <c:forEach var="t" items="${ntceEnddeHH}"><c:if test="${t.code ne '24'}"><option value="${t.code}" <c:if test="${t.code eq _edHH}">selected="selected"</c:if>>${t.codeNm}</option></c:if></c:forEach> | |
| 53 | + </select>시 | |
| 54 | + <select id="ntceEnddeMM" class="sel" style="width:auto;"> | |
| 55 | + <c:forEach var="t" items="${ntceEnddeMM}"><c:if test="${t.code ne '60'}"><option value="${t.code}" <c:if test="${t.code eq _edMM}">selected="selected"</c:if>>${t.codeNm}</option></c:if></c:forEach> | |
| 56 | + </select>분 | |
| 57 | + </span> | |
| 58 | + <p style="margin-top:6px;color:#888;font-size:13px;">공지로 등록하면 사용자 게시판 목록 맨 위에 '공지'로 고정됩니다. 기간을 지정하면 종료 시각 이후 일반 글로 돌아갑니다.</p> | |
| 59 | + <script type="text/javascript"> | |
| 60 | + $(function(){ | |
| 61 | + // 공지 체크 시 [기한 없음 / 기간 지정] 노출, 기간 지정 선택 시에만 기간 입력 노출 | |
| 62 | + function fn_toggle_notice_period(){ | |
| 63 | + var isNotice = $('#noticeAt').is(':checked'); | |
| 64 | + var isUnlimited = $('#ntceUnlimited').is(':checked'); | |
| 65 | + $('.notice_unlimited_wrap').toggle(isNotice); | |
| 66 | + $('.notice_period').toggle(isNotice && !isUnlimited); | |
| 67 | + } | |
| 68 | + $('#noticeAt, input[name=ntcePeriodType]').on('change', fn_toggle_notice_period); | |
| 69 | + fn_toggle_notice_period(); | |
| 70 | + }); | |
| 71 | + </script> | |
| 72 | + </td> | |
| 73 | + </tr> | |
| 74 | +</c:if> |
--- src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp
+++ src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp
... | ... | @@ -294,9 +294,11 @@ |
| 294 | 294 |
<!-- 공지사항 --> |
| 295 | 295 |
<c:if test="${'1' eq searchVO.pageIndex}">
|
| 296 | 296 |
<c:forEach var="result" items="${notifyList}" varStatus="status">
|
| 297 |
- <tr> |
|
| 298 |
- <td>[공지]</td> |
|
| 299 |
- <td></td> |
|
| 297 |
+ <tr id="tr_${result.nttId}">
|
|
| 298 |
+ <td> |
|
| 299 |
+ <input type="checkbox" name="checkList" id="checkList_${result.nttId}" value="${result.nttId}|${result.atchFileId}">
|
|
| 300 |
+ </td> |
|
| 301 |
+ <td><b style="color:#1e4fc0;">공지</b></td> |
|
| 300 | 302 |
<td> |
| 301 | 303 |
<a href="javascript:fn_egov_inqire_notice('<c:out value="${result.bbsId}"/>', '<c:out value="${result.nttId}"/>');">
|
| 302 | 304 |
<c:out value="${result.nttSj}" />
|
--- src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp
+++ src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp
... | ... | @@ -99,7 +99,10 @@ |
| 99 | 99 |
tempTxt = "모집기간" ; |
| 100 | 100 |
</c:if> |
| 101 | 101 |
|
| 102 |
- if($("input:checkbox[name='noticeAt']").is(":checked") || tempTxt=='모집기간'){
|
|
| 102 |
+ if($("input:checkbox[name='noticeAt']").is(":checked") && $('#ntceUnlimited').is(":checked")){ /* 기한 없음 */
|
|
| 103 |
+ $('#ntceBgnde').val('190001010000');
|
|
| 104 |
+ $('#ntceEndde').val('999912312359');
|
|
| 105 |
+ }else if($("input:checkbox[name='noticeAt']").is(":checked") || tempTxt=='모집기간'){
|
|
| 103 | 106 |
{
|
| 104 | 107 |
if($('#ntceBgndeYYYMMDD').val() == ''){
|
| 105 | 108 |
alert(tempTxt+" 시작일은 필수입니다."); |
... | ... | @@ -212,6 +215,7 @@ |
| 212 | 215 |
<form:errors path="nttSj" cssClass="input w100per"/> |
| 213 | 216 |
</td> |
| 214 | 217 |
</tr> |
| 218 |
+ <%@ include file="EgovNoticeAtRow.jsp" %> |
|
| 215 | 219 |
<c:if test="${'9650000' eq bdMstr.menuNo}">
|
| 216 | 220 |
<tr> |
| 217 | 221 |
<th> |
--- src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeUpdt.jsp
+++ src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeUpdt.jsp
... | ... | @@ -58,7 +58,10 @@ |
| 58 | 58 |
tempTxt = "모집기간" ; |
| 59 | 59 |
</c:if> |
| 60 | 60 |
|
| 61 |
- if($("input:checkbox[name='noticeAt']").is(":checked") || tempTxt=='모집기간'){
|
|
| 61 |
+ if($("input:checkbox[name='noticeAt']").is(":checked") && $('#ntceUnlimited').is(":checked")){ /* 기한 없음 */
|
|
| 62 |
+ $('#ntceBgnde').val('190001010000');
|
|
| 63 |
+ $('#ntceEndde').val('999912312359');
|
|
| 64 |
+ }else if($("input:checkbox[name='noticeAt']").is(":checked") || tempTxt=='모집기간'){
|
|
| 62 | 65 |
{
|
| 63 | 66 |
if($('#ntceBgndeYYYMMDD').val() == ''){
|
| 64 | 67 |
alert(tempTxt+" 시작일은 필수입니다."); |
... | ... | @@ -211,6 +214,7 @@ |
| 211 | 214 |
<form:errors path="nttSj" cssClass="w100per" /> |
| 212 | 215 |
</td> |
| 213 | 216 |
</tr> |
| 217 |
+ <%@ include file="EgovNoticeAtRow.jsp" %> |
|
| 214 | 218 |
<c:if test="${'9650000' eq bdMstr.menuNo }">
|
| 215 | 219 |
<tr> |
| 216 | 220 |
<th>URL</th> |
--- src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp
+++ src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp
... | ... | @@ -186,6 +186,7 @@ |
| 186 | 186 |
<td> |
| 187 | 187 |
<c:out value="${result.frstRegisterPnttm}" />
|
| 188 | 188 |
</td> |
| 189 |
+ <td><c:out value="${result.frstRegisterNm}" /></td>
|
|
| 189 | 190 |
<c:if test="${brdMstrVO.viewsYn ne 'N'}">
|
| 190 | 191 |
<td><c:out value="${result.inqireCo}" /></td>
|
| 191 | 192 |
</c:if> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?