somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

수정요청사항 수정

Browse Source
This commit is contained in:
JSYOO 2021-11-25 13:29:06 +09:00
parent 2d0e9d4afc
commit 70d804f930
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/nlib/col/service/CollectionVO.java
View File

@ -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)
// 기본공개

4
src/main/java/nlib/col/service/impl/CollectionServiceImpl.java
View File

@ -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()));

12
src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
View File

@ -1,7 +1,7 @@
<%
/**
* <pre>
* @Class Name : selectItemInfo.jsp
* @Class Name : selectItemDetail.jsp
*
* @Description : 소장자료 상세내용을 조회한다.
*
@ -218,7 +218,9 @@ function goList(){
<div class="b-btn">
<c:if test="${result.ableRentNow eq true }"><button type="button" class="btn btn-color" onclick="gfn_rentItem('${result.mngOrgCd}', '${result.masterId}')">대출예약</button></c:if>
<c:if test="${result.ableReadNow eq true }"><button type="button" class="btn btn-green" onclick="gfn_reserveReadItem('${result.mngOrgCd}', '${result.masterId}')">방문열람신청</button></c:if>
<c:if test="${result.ableRent eq true or result.ableRead eq true}"><button type="button" class="btn btn-orange" onclick="fn_addRentCart('${result.masterId}', '${result.useStatus}')">카트담기</button></c:if>
<c:if test="${result.ableRent eq true or result.ableRead eq true}">
<button type="button" class="btn btn-orange" onclick="fn_addRentCart('${result.masterId}', '${result.lentYn}', '${result.onReqYn}')">카트담기</button>
</c:if>
</div>
<c:if test="${fn:length(keywordList) > 0 }">
<div class="keyword">
@ -250,8 +252,8 @@ function goList(){
<div class="title">대출</div>
<div class="con">
<c:if test="${result.ableRentAppNow eq true}"><span class="poss">신청가능</span></c:if>
<c:if test="${result.ableRentResNow eq true}"><span class="poss">예약가능</span></c:if>
<c:if test="${result.ableRentNow ne true}"><span class="imposs">신청/예약불가</span></c:if>
<c:if test="${result.ableRentAppNow eq false and result.ableRentResNow eq true}"><span class="poss">예약가능</span></c:if>
<c:if test="${result.ableRentNow eq false}"><span class="imposs">신청/예약불가</span></c:if>
</div>
</div>
<div class="list">
@ -259,7 +261,7 @@ function goList(){
<div class="title">방문열람</div>
<div class="con">
<c:if test="${result.ableReadNow eq true }"><span class="poss">신청가능</span></c:if>
<c:if test="${result.ableReadNow ne true }"><span class="imposs">신청불가</span></c:if>
<c:if test="${result.ableReadNow eq false }"><span class="imposs">신청불가</span></c:if>
</div>
</div>
</div>

3
src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
View File

@ -461,7 +461,6 @@ function fn_search_article(pageIndex) {
<c:if test="${result.ableOther eq true}">
<span class="etc">기타</span>
</c:if>
</div>
<div class="title"><a href="javascript:void(0)" onclick="goDetail('${result.masterId}');"><c:out value="${result.title}"/></a></div>
<div class="code"><c:out value="${result.mngtNo}"/></div>
@ -488,7 +487,7 @@ function fn_search_article(pageIndex) {
<span>방문열람신청 가능</span>
</c:if>
<c:if test="${result.ableReadNow eq false}">
<span>방문열람신청 불가</span>
<span>방문열람신청 불가 </span>
</c:if>
</p>
<c:if test="${result.ableOnline eq true}">

15
src/main/webapp/js/cart.js
View File

@ -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;