From 168894bd30f561d339a34077f001828719ab0873 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Wed, 17 Nov 2021 09:50:11 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../col/service/impl/ReadServiceImpl.java | 2 +- .../java/nlib/col/service/impl/RentDAO.java | 8 - .../nlib/user/web/UserInfoController.java | 2 +- .../mapper/nlib/col/RentDAO_SQL.xml | 10 - .../WEB-INF/jsp/nlib/cmm/headerSubPart.jsp | 4 +- .../WEB-INF/jsp/nlib/userInfo/getMyHome.jsp | 1 + src/main/webapp/WEB-INF/tiles/inc/menu.jsp | 10 - src/main/webapp/js/default.js | 4 +- src/main/webapp/test/callback.html | 22 -- src/main/webapp/test/naverLogin.html | 22 -- src/main/webapp/test/test.html | 230 --------------- src/main/webapp/test/testRest.html | 262 ------------------ 12 files changed, 7 insertions(+), 570 deletions(-) delete mode 100644 src/main/webapp/test/callback.html delete mode 100644 src/main/webapp/test/naverLogin.html delete mode 100644 src/main/webapp/test/test.html delete mode 100644 src/main/webapp/test/testRest.html diff --git a/src/main/java/nlib/col/service/impl/ReadServiceImpl.java b/src/main/java/nlib/col/service/impl/ReadServiceImpl.java index 49c7823a..98e78779 100644 --- a/src/main/java/nlib/col/service/impl/ReadServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/ReadServiceImpl.java @@ -206,7 +206,7 @@ public class ReadServiceImpl implements ReadService { reqVO.setMbInfoId(searchVO.getMbInfoId()); // 통신 시, 암호화되어 송수신됨 reqVO.setPageSize(searchVO.getPageSize()); reqVO.setPageIndex(searchVO.getPageIndex()); - reqVO.putInfoItem("mngOrgCd", StringUtil.getString(searchVO.getMngOrgCd(), "KCCF")); // DDDDDDDDDDDDDDDDDDDd api 변경시까지 유지 + reqVO.putInfoItem("mngOrgCd", searchVO.getMngOrgCd()); reqVO.putInfoItem("reqStatusDivCd", searchVO.getReqStatusDivCd()); return dataApi.request(reqVO); } diff --git a/src/main/java/nlib/col/service/impl/RentDAO.java b/src/main/java/nlib/col/service/impl/RentDAO.java index ac5cca19..bfda4904 100644 --- a/src/main/java/nlib/col/service/impl/RentDAO.java +++ b/src/main/java/nlib/col/service/impl/RentDAO.java @@ -12,12 +12,4 @@ public interface RentDAO { public List> listRentMngOrg(String mbInfoId); - - /** - * 사용자의 대출현황을 조회한다. - * - * @param mbInfoId - * @return - */ - public Map getRentStats(String mbInfoId); } diff --git a/src/main/java/nlib/user/web/UserInfoController.java b/src/main/java/nlib/user/web/UserInfoController.java index 4ed39cbb..e2cc30ef 100644 --- a/src/main/java/nlib/user/web/UserInfoController.java +++ b/src/main/java/nlib/user/web/UserInfoController.java @@ -347,7 +347,7 @@ public class UserInfoController extends NlibCommonController { model.addAttribute("rentTotalCount", resRentVO.getRecordTotCount()); // 방문열람내역 (최근 5개) - searchCollectionVO.setReqStatusDivCd("A"); // API 변경될떄까지 임시 값 보냄 DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD + searchCollectionVO.setReqStatusDivCd(null); DataApiResVO resReadVO = readService.listReadItems(searchCollectionVO); List readList = collectionService.setDetailInfoForHashList(resReadVO.getRecordList(), searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small")); model.addAttribute("readList", readList); diff --git a/src/main/resources/egovframework/mapper/nlib/col/RentDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/col/RentDAO_SQL.xml index 8682bbfb..e552d611 100644 --- a/src/main/resources/egovframework/mapper/nlib/col/RentDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/col/RentDAO_SQL.xml @@ -20,14 +20,4 @@ ORDER BY C.DEPT_NM - \ 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 f96ec1db..ec5f48ad 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp @@ -62,14 +62,14 @@ function fn_getMemberCard() {
    -
  • +
    • -
  • +
  • diff --git a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp index 1b25df5a..ad1f430c 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp @@ -229,6 +229,7 @@
    ${item.reqStatusDivNm} ${item.reqStatusDivNm} + ${item.reqStatusDivNm} ${item.reqStatusDivNm} ${item.reqStatusDivNm} ${item.reqStatusDivNm} diff --git a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp index fe3bf79a..c19038b8 100644 --- a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp @@ -56,16 +56,6 @@ $(document).ready(function() {
  • 관심자료
  • 대출관리
  • 방문열람관리
    • - - -
  • --- 이하 임시 추가 메뉴 ---
    • -
  • ID/PW찾기
    • -
  • 암호화
    • -
  • 환경설정갱신
    • -
  • 코드조회
    • -
  • API샘플
    • - -
diff --git a/src/main/webapp/js/default.js b/src/main/webapp/js/default.js index d30e3766..3c0a9780 100644 --- a/src/main/webapp/js/default.js +++ b/src/main/webapp/js/default.js @@ -123,9 +123,9 @@ $(document).ready(function(){ jQuery(function($) { // 상세검색 팝업 열기 $('.btn-search-detail').on('click', function () { - // 클릭 시, 컨텐츠 로딩되도록 처리 (2021.10.20 DDDDDDDDDD 추가) : 시작 + // 클릭 시, 컨텐츠 로딩되도록 처리 (2021.10.20 NLIB 추가) : 시작 fn_layerPopWithClass("/search/getDetailedSearchFormPopup.do", "popup pop-advanced-search"); - // 클릭 시, 컨텐츠 로딩되도록 처리 (2021.10.20 DDDDDDDDDD 추가) : 종료 + // 클릭 시, 컨텐츠 로딩되도록 처리 (2021.10.20 NLIB 추가) : 종료 }); }); diff --git a/src/main/webapp/test/callback.html b/src/main/webapp/test/callback.html deleted file mode 100644 index fe4b3854..00000000 --- a/src/main/webapp/test/callback.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/test/naverLogin.html b/src/main/webapp/test/naverLogin.html deleted file mode 100644 index 400ba602..00000000 --- a/src/main/webapp/test/naverLogin.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - 네이버 로그인 - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/test/test.html b/src/main/webapp/test/test.html deleted file mode 100644 index cd2b8f46..00000000 --- a/src/main/webapp/test/test.html +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -소장자료관 - - - - - - -
- - - - -
- - - - -
- - -
- - -
- - - - - - - -Insert title here - - -가입되셨습니다. 환영합니다 - - - - - - -
- - - - - - - \ No newline at end of file diff --git a/src/main/webapp/test/testRest.html b/src/main/webapp/test/testRest.html deleted file mode 100644 index 62994b79..00000000 --- a/src/main/webapp/test/testRest.html +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -소장자료관 - - - - - - -
- - - - - -
- - - - -
- - -
- - -
- - - - - - - - - - - - -
-

안내 섹션영역

-
-
-
자물쇠 아이콘
-

로그인 및 회원가입 안내

-
-
-
-
-
-

먼저 회원가입하신 후, 이용하여 주시기 바랍니다.

-
-
-

위의 안내 메시지를 확인하신 후, 다시 로그인하시거나 회원가입을 진행해 주시기 바랍니다.

-
-
- 홈으로 -   -   - -   -   - - - 회원가입 - -
-
-
-
-
-
- - - - -
- - -
-
- - - \ No newline at end of file