diff --git a/src/main/java/nlib/bbs/web/FaqController.java b/src/main/java/nlib/bbs/web/FaqController.java index 8111668e..c116a4a9 100644 --- a/src/main/java/nlib/bbs/web/FaqController.java +++ b/src/main/java/nlib/bbs/web/FaqController.java @@ -31,6 +31,7 @@ import nlib.cmm.crypto.NlibPasswordEncoder; import nlib.cmm.service.CodeService; import nlib.cmm.service.NlibProperty; import nlib.cmm.service.NotificationVO; +import nlib.cmm.service.PagingVO; import nlib.restful.service.DataApiReqVO; import nlib.restful.service.DataApiResVO; import nlib.user.service.NlibLoginVO; @@ -64,7 +65,7 @@ public class FaqController extends NlibCommonController { ) throws Exception { - List> questionTypeList = codeService.listCodes("FAQ_TYPE_CD"); + List> questionTypeList = codeService.listCodes("NLIB_FAQ_TYPE_CD"); model.addAttribute("questionTypeList", questionTypeList); model.addAttribute("searchArticle", searchArticleVO); @@ -102,6 +103,14 @@ public class FaqController 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/java/nlib/bbs/web/QnaController.java b/src/main/java/nlib/bbs/web/QnaController.java index 6dc7d0b8..baa49d31 100644 --- a/src/main/java/nlib/bbs/web/QnaController.java +++ b/src/main/java/nlib/bbs/web/QnaController.java @@ -34,6 +34,7 @@ import nlib.bbs.service.QnaService; import nlib.cmm.NlibCommonController; import nlib.cmm.service.CodeService; import nlib.cmm.service.NlibProperty; +import nlib.cmm.service.PagingVO; import nlib.user.service.NlibLoginVO; import nlib.util.StringUtil; @@ -123,6 +124,13 @@ public class QnaController extends NlibCommonController { retMap.put("itemsCount", totRecordCount); retMap.put("message", message); + 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 7e996612..752a1f1d 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml @@ -18,7 +18,7 @@ - AND S.CONTENT LIKE CONCAT('%', #{escapeSearchKeyword}, '%') + AND IFNULL(S.CONTENT,'') LIKE CONCAT('%', #{escapeSearchKeyword}, '%') AND IFNULL(S.DELETE_YN, 'N') = 'N' diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml index 3a9d0174..745e01c9 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml @@ -19,7 +19,7 @@ - AND CONCAT(S.CONTENT, S.ANSWER) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') + AND CONCAT(IFNULL(S.CONTENT,''), IFNULL(S.ANSWER,'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml index c7cde1bd..22f9775b 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml @@ -18,7 +18,7 @@ - AND CONCAT(S.CONTENT, S.ANSWER) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') + AND CONCAT(IFNULL(S.CONTENT,''), IFNULL(S.ANSWER,'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%') 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 e715cd46..44191c91 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp @@ -37,12 +37,12 @@ $( document ).ready(function() { - if('${message}' != "null" && '${message}' != "") { - alert("${message}"); - } - + // 메시지 표출 + if(!fn_isEmpty('${message}')) { + alert("${message}"); + } - // 검색 버튼 클릭 + // 검색 수행 이벤트 $("#btnSearch").on("click", function(e) { fn_searchArticle(1); }); @@ -114,11 +114,13 @@ // 검색결과 if($("#searchKeyword").val() != "") { - $("#searchKeywordPrt").text($("#searchKeyword").val()); + $("#searchKeywordPrt").text("'" + $("#searchKeyword").val() + "'"); $("#searchResult").show(); + $("#cntResult").hide(); } else { $("#searchResult").hide(); + $("#cntResult").show(); } // 기존 데이터 CLEAR @@ -170,18 +172,20 @@
-
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp index 8df3e915..8036c05a 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp @@ -31,127 +31,25 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -자주하는질문(DB) +FAQ - - - - ${pageTitle} - - - - - - - - - - -

${pageTitle }

- - 메시지 : ${message} - -
- 총 건
-
- - - -  
- - - - - - - - - - -
전체${qTypeItem.sCodeNm}
-
- - - - - - - - - - - - -
- -
- - - - - - + +
+

FAQ 섹션영역

+
+
+
+
    +
  • HOME
    • +
  • 고객지원
    • +
  • ${pageTitle}
    • +
+
    +
  • ${pageTitle}
    • +
+
+
화살표 아이콘
+
+
+
+
+ + +
+
+
+ + + + + + +
+
총 0건
+ +
+ +
+
+ +
+
+ + +
+
+
+
+
+
+
+ +
+
    +
+
+ +
    + +
    +
    +
    + +
    +
    +
    +
    - - - - - - + + + + +
    - - - - + diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp index 67452d7f..b6a0302b 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp @@ -46,6 +46,10 @@ diff --git a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMemberQrcodeFormPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMemberQrcodeFormPopup.jsp index ecc6f64e..85a3295e 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMemberQrcodeFormPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMemberQrcodeFormPopup.jsp @@ -37,31 +37,32 @@ 회원증 +
    -

    내 회원증 확인

    -

    QR코드를 리더기에 스캔하세요.

    +

    회원증

    ${loginVO.name}

    ${dateStr}

    +
    +

    QR코드를 리더기에 스캔하세요.

    + QR코드 이미지 +
    회원코드
    ${loginVO.mbInfoId}
    -
    -
    남은시간23초
    -
    - QR코드 이미지 -
    -
    -
    -

    ※ 캡쳐한 회원증을 통한 자료대출 및 열람을 불허합니다. ※ 캡쳐한 회원증을 통한 자료대출 및 열람을 불허합니다.

    - +
    +

    ※ 캡쳐한 회원증을 통한 자료대출 및 열람을 불허합니다.

    +
    + +
    + \ No newline at end of file diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 57f10644..7f07593b 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -1010,8 +1010,8 @@
    - -