From 70d804f930f8ccd438fdb0f5044f762c3a05484b Mon Sep 17 00:00:00 2001 From: JSYOO Date: Thu, 25 Nov 2021 13:29:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95=EC=9A=94=EC=B2=AD=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/col/service/CollectionVO.java | 4 ++-- .../col/service/impl/CollectionServiceImpl.java | 4 ++++ .../jsp/nlib/collection/searchItemDetail.jsp | 12 +++++++----- .../WEB-INF/jsp/nlib/collection/searchList.jsp | 3 +-- src/main/webapp/js/cart.js | 15 ++++++--------- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/main/java/nlib/col/service/CollectionVO.java b/src/main/java/nlib/col/service/CollectionVO.java index c4a5d6ff..071494fa 100644 --- a/src/main/java/nlib/col/service/CollectionVO.java +++ b/src/main/java/nlib/col/service/CollectionVO.java @@ -191,7 +191,7 @@ public class CollectionVO extends PagingVO { */ public boolean isAbleRead() { - return "Y".equalsIgnoreCase(StringUtil.getString(getOnReqYn(), "N")); + return "Y".equalsIgnoreCase(StringUtil.getString(getOffReqYn(), "N")); /* 각 서비스 가능 여부가 API에 별도 항목으로 추가됨에 따라 이하 주석 처리 2021.11.24) @@ -231,7 +231,7 @@ public class CollectionVO extends PagingVO { */ public boolean isAbleOnline() { - return "Y".equalsIgnoreCase(StringUtil.getString(getDigitalReadYn(), "N")); + return "Y".equalsIgnoreCase(StringUtil.getString(getOnReqYn(), "N")); /* 각 서비스 가능 여부가 API에 별도 항목으로 추가됨에 따라 이하 주석 처리 2021.11.24) // 기본공개 diff --git a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java index b77acc0d..fef83f20 100644 --- a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java @@ -189,6 +189,10 @@ public class CollectionServiceImpl implements CollectionService { vo.setOperReadRangeCd(StringUtil.getString(cVO.getOperReadRangeCd(), vo.getOperReadRangeCd())); vo.setOperOutRangeCd (StringUtil.getString(cVO.getOperOutRangeCd() , vo.getOperOutRangeCd())); vo.setUseStatus (StringUtil.getString(cVO.getUseStatus() , vo.getUseStatus())); + vo.setLentYn (StringUtil.getString(cVO.getLentYn() , vo.getLentYn())); + vo.setOnReqYn (StringUtil.getString(cVO.getOnReqYn() , vo.getOnReqYn())); + vo.setOffReqYn (StringUtil.getString(cVO.getOffReqYn() , vo.getOffReqYn())); + vo.setEtcYn (StringUtil.getString(cVO.getEtcYn() , vo.getEtcYn())); vo.setRtnExpctDd (StringUtil.formatDateStr(cVO.getRtnExpctDd() , "-")); vo.setAwaiterCnt (StringUtil.getInt (cVO.getAwaiterCnt() , vo.getAwaiterCnt())); vo.setBookLentPsblYn (StringUtil.getString(cVO.getBookLentPsblYn() , vo.getBookLentPsblYn())); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp index 7b154c81..409f2e7f 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -1,7 +1,7 @@ <% /** * 
- * @Class Name : selectItemInfo.jsp
+ * @Class Name : selectItemDetail.jsp
  * 
  * @Description : 소장자료 상세내용을 조회한다.
  * 
@@ -218,7 +218,9 @@ function goList(){
                             

                                 
                                 
-                                
+                                
+                                    
+                                
                             

                             
                                 

@@ -250,8 +252,8 @@ function goList(){
                             
대출

                             

                                 신청가능
-                                예약가능
-                                신청/예약불가
+                                예약가능
+                                신청/예약불가
                             

                         

                         

@@ -259,7 +261,7 @@ function goList(){
                             
방문열람

                             

                                 신청가능
-                                신청불가
+                                신청불가
                             

                         

                     
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
index 4036967f..7133b821 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
@@ -461,7 +461,6 @@ function fn_search_article(pageIndex) {
                                                                 
                                                                    기타
                                                                 
-                                                                
                                                             
                                                             

                                                             

@@ -488,7 +487,7 @@ function fn_search_article(pageIndex) {
                                                                     방문열람신청 가능
                                                                
                                                               
-                                                                    방문열람신청 불가
+                                                                    방문열람신청 불가 
                                                                
                                                                

                                                             
diff --git a/src/main/webapp/js/cart.js b/src/main/webapp/js/cart.js
index 32fbcc43..b55e6bbd 100644
--- a/src/main/webapp/js/cart.js
+++ b/src/main/webapp/js/cart.js
@@ -6,7 +6,7 @@
  *
  */
 
-function fn_addRentCart(masterId, useStatus) {
+function fn_addRentCart(masterId, lentYn , onReqYn ) {
 	
 	/* useStatus
 		01 : 이용가능
@@ -17,7 +17,7 @@ function fn_addRentCart(masterId, useStatus) {
 		06 : 열람대기(대출불가능)
 		07 : 온라인열람만"
 	 */
-	fn_addRentCartItem(masterId, useStatus 
+	fn_addRentCartItem(masterId, lentYn, onReqYn 
 	  , function(data) {
 			if(data.code == "S") {
 				if(confirm(data.message + "\n카트로 이동하시겠습니까?")) {
@@ -39,7 +39,7 @@ function fn_gotoCart() {
 	location.href = "/cart/listCartItems.do";
 }
 
-function fn_addRentCartItem(masterId, useStatus, resolve, reject) {
+function fn_addRentCartItem(masterId, lentYn, onReqYn,  resolve, reject) {
 	
 	
 	var cartTypeCd = null;
@@ -49,18 +49,15 @@ function fn_addRentCartItem(masterId, useStatus, resolve, reject) {
 		return;
 	}
 	
-	if(useStatus == "undefined" || useStatus == "") {
+	if((lentYn == "undefined" || lentYn == "") || (onReqYn == "undefined" || onReqYn == "")) {
 		reject(new Error("선택된 자료의 상태 정보를 확인할 수 없습니다."));
 		return;
 	}
 	
-	if("01" <= useStatus && useStatus <= "04") {
+	if(lentYn == "Y") {
 		cartTypeCd = "1"; // 대출
-	} else if("05" <= useStatus && useStatus <= "06") {
+	} else if(onReqYn == "Y") {
 		cartTypeCd = "2"; // 방문열람
-	} else if("07" == useStatus) {
-		reject(new Error("해당 자료는 온라인열람만 가능한 자료입니다. 온라인 열람을 통해 자료를 조회하시기 바랍니다."));
-		return null;
 	} else {
 		reject(new Error("해당 자료의 상태를 확인할 수 없습니다."));
 		return null;