diff --git a/src/main/java/nlib/bbs/web/AncmntController.java b/src/main/java/nlib/bbs/web/AncmntController.java index a5654163..8d3c360e 100644 --- a/src/main/java/nlib/bbs/web/AncmntController.java +++ b/src/main/java/nlib/bbs/web/AncmntController.java @@ -18,12 +18,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import nlib.bbs.service.BoardService; -import nlib.bbs.service.impl.AncmntServiceImpl; import nlib.bbs.service.ArticleVO; +import nlib.bbs.service.BoardService; import nlib.cmm.NlibCommonController; import nlib.cmm.service.NlibProperty; -import nlib.util.StringUtil; +import nlib.cmm.service.PagingVO; @Controller public class AncmntController extends NlibCommonController @@ -87,6 +86,14 @@ public class AncmntController extends NlibCommonController retMap.put("data", list); retMap.put("itemsCount", totRecordCount); + PagingVO pageVO = new PagingVO(); + pageVO.setPagingVO(totRecordCount, searchArticleVO.getPageIndex(), searchArticleVO.getPageSize()); + retMap.put("pagingPageIndex" , pageVO.getPageIndex()); + retMap.put("pagingTotRecordCount", pageVO.getTotRecordCount()); + retMap.put("pagingStartPage" , pageVO.getStartPage()); + retMap.put("pagingEndPage" , pageVO.getEndPage()); + retMap.put("pagingLastPage" , pageVO.getLastPage()); + return makeResponseEntityJson(retMap); } diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml index 88cae262..7e996612 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml @@ -30,7 +30,7 @@ , A.MNG_ORG_CD , B.DEPT_NM AS MNG_ORG_NM , A.TITLE - , A.NOTI_YN + , IF(IFNULL(A.NOTI_YN, 'N') = '', 'N', A.NOTI_YN) AS NOTI_YN , A.OPEN_YN , A.POST_START_DATE , A.POST_END_DATE @@ -38,14 +38,14 @@ , CASE WHEN A.BD_ATTACH_FILE_ID IS NULL OR A.BD_ATTACH_FILE_ID = '' THEN 'N' ELSE 'Y' END AS ATTACH_YN , DATE_FORMAT(A.REG_DD, '%Y-%m-%d') AS REG_DD , A2.RNO - , C.USER_NM AS REG_NM + , IF(IFNULL(C.USER_NM,'') = '', '관리자', C.USER_NM) AS REG_NM FROM BD_NLIB_ANCMNT A INNER JOIN ( SELECT ANCMNT_ID, RNO FROM ( SELECT S.ANCMNT_ID - , ROW_NUMBER() OVER(PARTITION BY 1 ORDER BY S.REG_DD, S.TITLE) AS RNO - , ROW_NUMBER() OVER(PARTITION BY 1 ORDER BY S.REG_DD DESC, S.TITLE DESC) AS ONO + , ROW_NUMBER() OVER(PARTITION BY 1 ORDER BY IF(IFNULL(S.NOTI_YN, 'N') = '', 'N', S.NOTI_YN), S.REG_DD, S.TITLE, S.ANCMNT_ID) AS RNO + , ROW_NUMBER() OVER(PARTITION BY 1 ORDER BY IF(IFNULL(S.NOTI_YN, 'N') = '', 'N', S.NOTI_YN) DESC, S.REG_DD DESC, S.TITLE desc, S.ANCMNT_ID DESC) AS ONO ) S2 WHERE ONO BETWEEN (#{pageStartRowNum} + 1) AND (#{pageStartRowNum} + #{pageSize}) @@ -72,7 +72,7 @@ , B.DEPT_NM AS MNG_ORG_NM , A.TITLE , A.CONTENT - , A.NOTI_YN + , IF(IFNULL(A.NOTI_YN, 'N') = '', 'N', A.NOTI_YN) AS NOTI_YN , A.OPEN_YN , A.POST_START_DATE , A.POST_END_DATE @@ -80,7 +80,7 @@ , CASE WHEN A.BD_ATTACH_FILE_ID IS NULL OR A.BD_ATTACH_FILE_ID = '' THEN 'N' ELSE 'Y' END AS ATTACH_YN , A.BD_ATTACH_FILE_ID , DATE_FORMAT(A.REG_DD, '%Y-%m-%d') AS REG_DD - , C.USER_NM AS REG_NM + , IF(IFNULL(C.USER_NM,'') = '', '관리자', C.USER_NM) AS REG_NM FROM BD_NLIB_ANCMNT A JOIN SM_DEPT B ON B.ORG_CD = A.MNG_ORG_CD diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp index af4ae724..e715cd46 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp @@ -31,125 +31,25 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -공지사항(DB) +공지사항 - - - - ${pageTitle} - - - - - - - - - - -

${pageTitle }

- - 메시지 : ${message} - -
- 총 건
-
- - - -  
-
- - - - - - - - - - -
- -
- - - - -
- - - + +
+

공지사항 섹션영역

+
+
+
+
    +
  • HOME
    • +
  • 고객지원
    • +
  • ${pageTitle }
    • +
+
    +
  • ${pageTitle }
    • +
+
+
화살표 아이콘
+
+
+ +
+
+
+ + +
+ +
+
    +
  • + NO + + 제목 + 등록자 + 등록일 + 첨부 +
    • +
+
+ +
    + +
    + +
    +
    +
    +
    + diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp index aab7f196..103e4a81 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp @@ -33,13 +33,16 @@ 공지사항 - 상세조회 - - - -${pageTitle} - - - + +
    +

    공지사항 보기 섹션영역

    +
    +
    +
    +
      +
    • HOME
      • +
    • 고객지원
      • +
    • ${pageTitle }
      • +
    +
      +
    • ${pageTitle }
      • +
    +
    +
    화살표 아이콘
    +
    +
    + +
    +
    +
    +
    +

    공지${article.title} +

    + + ${article.regNm } + ${article.regDd } + +
    + + + +
    + <% + // 파일정보 : 저장파일ID=원파일명 + %> + +
    + 파일 아이콘 + ${attachFile.orignlFileNm}, ${attachFile.fileSize} byte(s) + +
    +     +
    +     + +
    +
    +
    +

    + ${article.content} +

    +
    +
    +
      -

      ${pageTitle }

      +
    +
    +
    + 목록보기 +
    +
    +
    +
    + +
    +
    +
    -메시지 : ${message } -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    유형 - 공지 - 일반 - - 작성일${article.regDd }
    제목${article.title}
    질문내용${article.content}
    - <% - // 파일정보 : 저장파일ID=원파일명 - %> - - ${attachFile.orignlFileNm} (${attachFile.fileSize} byte(s))
    -     -
    첨부파일 없음 -
    - -
    - - - - -
    - -
    +
    -
    - - - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp index 0fa05dfd..3f63aa31 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp @@ -25,6 +25,17 @@ function goSearch(){ document.searchHeaderForm.submit(); } +function fn_getMemberCard() { + + // 클릭 시, 컨텐츠 로딩되도록 처리 (2021.10.20 DDDDDDDDDD 추가) : 시작 + $("#NLIB_LAYER_POPUP").addClass("pop-member"); + $("#NLIB_LAYER_POPUP").load("/userInfo/getMemberQrcode.do"); + // 클릭 시, 컨텐츠 로딩되도록 처리 (2021.10.20 DDDDDDDDDD 추가) : 종료 + + $('.pop-advanced-search').fadeIn(); + $('html,body').addClass('no-scroll'); +} + @@ -70,9 +81,9 @@ function goSearch(){ title="${userId} - ${councilNm} (${councilCd})" class="login-btn"> ${userName}님 로그아웃 +
  • 회원증
    • -
  • 회원증
  • 알림(${unreadNotiCnt })
    •  diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp index dff2466b..d26cc7cd 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -8,8 +8,9 @@ @@ -22,25 +23,25 @@ window.onload = function() {
    - +
    이용안내
    이용안내 아이콘
    플러스 아이콘
    - +
    찾아오시는 길
    지도 아이콘
    플러스 아이콘
    - +
    대출관리
    대출 아이콘
    플러스 아이콘
    - +
    열람관리
    열람 아이콘
    플러스 아이콘
    @@ -470,7 +471,7 @@ window.onload = function() {

    커뮤니티 섹션영역

    -
    공지사항더보기 더보기 아이콘
    +
    공지사항더보기 더보기 아이콘
    @@ -499,7 +500,7 @@ window.onload = function() {
    -
    Q&A더보기 더보기 아이콘
    +
    Q&A더보기 더보기 아이콘
    diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp index 6c035080..0f14dfe6 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp @@ -88,7 +88,7 @@ window.onload = function() { url: reqUrl, dataType: "json", data: JSON.stringify(inputData), - }).done(function(response){ + }).done(function(data){ <%// 그리드 데이터 예시 : // (1) 페이징 클라이언트에서 수행하는 경우(pageloading = false) : [{ "articleNo": 1, "articleType": "01" }, { "articleNo": 2, "articleType": "02" }] // (2) 페이징 서버에서 수행하는 경우(pageloading = true) : {data: [{...}], itemsCount: 255}%> @@ -98,8 +98,10 @@ window.onload = function() { retObj.data = []; } data.resolve(retObj); + }).fail(function (jqXHR, textStatus, errorThrown) { + alert("오류 : " + textStatus); }); - return data.promise(); + } // loadData },