From 6ae986e3ced9b9e8470a70e4adc9e6b48b86d7ab Mon Sep 17 00:00:00 2001 From: KNKIM Date: Fri, 12 Nov 2021 18:02:57 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=ED=8A=B8=20=EC=97=B0=EB=8F=99=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/col/service/ReadService.java | 2 +- .../col/service/impl/ReadServiceImpl.java | 28 ++++++++++++-- .../java/nlib/col/web/ReadController.java | 8 ++-- src/main/java/nlib/util/StringUtil.java | 8 ++-- .../mapper/nlib/col/CartDAO_SQL.xml | 1 + .../WEB-INF/jsp/nlib/cart/listCartItems.jsp | 17 ++------- .../WEB-INF/jsp/nlib/read/confirmRead.jsp | 4 +- .../WEB-INF/jsp/nlib/read/insertReadItems.jsp | 6 +-- .../WEB-INF/jsp/nlib/read/listReadItems.jsp | 37 +++++++++++++++++-- 9 files changed, 75 insertions(+), 36 deletions(-) diff --git a/src/main/java/nlib/col/service/ReadService.java b/src/main/java/nlib/col/service/ReadService.java index 4309af43..d536a404 100644 --- a/src/main/java/nlib/col/service/ReadService.java +++ b/src/main/java/nlib/col/service/ReadService.java @@ -47,7 +47,7 @@ public interface ReadService { * @param mngOrgCd * @return */ - public List insertReadItems(List list, String mbInfoId, CollectionVO readVO) throws Exception; + public List insertReadItems(List list, String mbInfoId, CollectionVO readVO, boolean fromCart) throws Exception; /** diff --git a/src/main/java/nlib/col/service/impl/ReadServiceImpl.java b/src/main/java/nlib/col/service/impl/ReadServiceImpl.java index b199e81b..572c3f02 100644 --- a/src/main/java/nlib/col/service/impl/ReadServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/ReadServiceImpl.java @@ -27,6 +27,9 @@ public class ReadServiceImpl implements ReadService { @Resource(name="readDAO") private ReadDAO readDAO; + @Resource(name="cartDAO") + private CartDAO cartDAO; + @Resource(name="informService") private InformService informService; @@ -53,7 +56,7 @@ public class ReadServiceImpl implements ReadService { * @param mngOrgCd * @return */ - public List insertReadItems(List list, String mbInfoId, CollectionVO readVO) throws Exception { + public List insertReadItems(List list, String mbInfoId, CollectionVO readVO, boolean fromCart) throws Exception { if(list == null || list.size() < 1) { log.error("insertReadItems > 열람 신청 대상 목록이 없습니다."); @@ -130,9 +133,26 @@ public class ReadServiceImpl implements ReadService { reqVO.putInfoItem("jsonMasterId", jsonMasterId); resVO = dataApi.request(reqVO); - CollectionVO rVO = null; cVO.setResult(resVO.getResultCode(), resVO.getResultMessage()); + // 카트에서 신청하여 성공한 경우, 카트 처리완료 변경 작업 + if(resVO != null && resVO.getResultCode() != null && resVO.getResultCode().startsWith("S") && fromCart) { + CollectionVO vVO = null; + for(int i=0; i changeCartProcDivCd=" + retUpdateProc); + } + } + } + readVO.setResultCode(resVO.getResultCode()); readVO.setResultMessage(resVO.getResultMessage()); @@ -140,8 +160,8 @@ public class ReadServiceImpl implements ReadService { if(StringUtil.startsWithIgnoreCase(resVO.getResultCode(), "S")) { readVO.setHopeReqPridDtmFrom(StringUtil.formatDateStr(resVO.getInfoItem("hopeReqPridDtmFrom", ""),"")); readVO.setHopeReqPridDtmTo(StringUtil.formatDateStr(resVO.getInfoItem("hopeReqPridDtmTo", ""),"")); - readVO.setRsrvId(resVO.getInfoItem("reqId", "")); // 열람신청번호 - readVO.setRsrvId(resVO.getInfoItem("reqDd", "")); // 열람신청일자 + readVO.setReqId(resVO.getInfoItem("reqId", "")); // 열람신청번호 + readVO.setReqDd(resVO.getInfoItem("reqDd", "")); // 열람신청일자 readVO.setSelItems(resVO.getInfoItem("masterId")); // 자료번호 } else { readVO.setRsrvId(null); // 열람신청번호 diff --git a/src/main/java/nlib/col/web/ReadController.java b/src/main/java/nlib/col/web/ReadController.java index 078215ff..95301fd7 100644 --- a/src/main/java/nlib/col/web/ReadController.java +++ b/src/main/java/nlib/col/web/ReadController.java @@ -149,7 +149,7 @@ public class ReadController extends NlibCommonController { List list = collectionService.makeListOfCollectionVO(selItems); - list = readService.insertReadItems(list, mbInfoId, readVO); + list = readService.insertReadItems(list, mbInfoId, readVO, fromCart); list = collectionService.setDetailInfoForList(list, mbInfoId, NlibProperty.getString("thumbnail.image.url.small")); model.addAttribute("readVO", readVO); @@ -267,15 +267,15 @@ public class ReadController extends NlibCommonController { resultMessage = "로그인하신 후, 이용바랍니다."; } - if(StringUtil.isEmpty(searchVO.getMngOrgCd())) { + if(resultMessage != null && StringUtil.isEmpty(searchVO.getMngOrgCd())) { resultMessage = "문화원정보가 부적합합니다. 다시 요청하여 주시기 바랍니다."; } - if(StringUtil.isEmpty(searchVO.getReqId())) { + if(resultMessage != null && StringUtil.isEmpty(searchVO.getReqId())) { resultMessage = "취소할 방문열람신청번호 정보가 부적합합니다. 다시 요청하여 주시기 바랍니다."; } - if(StringUtil.isEmpty(searchVO.getMasterId())) { + if(resultMessage != null && StringUtil.isEmpty(searchVO.getMasterId())) { resultMessage = "취소할 자료정보 정보가 부적합합니다. 다시 요청하여 주시기 바랍니다."; } diff --git a/src/main/java/nlib/util/StringUtil.java b/src/main/java/nlib/util/StringUtil.java index bc1f0065..46e1d564 100644 --- a/src/main/java/nlib/util/StringUtil.java +++ b/src/main/java/nlib/util/StringUtil.java @@ -273,11 +273,9 @@ public class StringUtil extends StringUtils { if(isEmpty(dateStr)) return defaultStr; String tmpDateStr = dateStr.trim(); - switch(tmpDateStr.length()) { - case 4 : return dateStr; // 연도만 있는 경우 - case 6 : return tmpDateStr.substring(0, 4) + "-" + tmpDateStr.substring(4); // YYYY-MM - case 8 : return tmpDateStr.substring(0, 4) + "-" + tmpDateStr.substring(4, 6) + "-" + tmpDateStr.substring(6); // YYYY-MM-DD - } + if(4 <= tmpDateStr.length() && tmpDateStr.length() < 6) return tmpDateStr.substring(0, 4); // 연도만 있는 경우 + else if(6 <= tmpDateStr.length() && tmpDateStr.length() < 8) return tmpDateStr.substring(0, 4) + "-" + tmpDateStr.substring(4, 6); // YYYY-MM + else if(8 <= tmpDateStr.length()) return tmpDateStr.substring(0, 4) + "-" + tmpDateStr.substring(4, 6) + "-" + tmpDateStr.substring(6, 8); // YYYY-MM-DD return defaultStr; } diff --git a/src/main/resources/egovframework/mapper/nlib/col/CartDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/col/CartDAO_SQL.xml index d906b72e..89de712f 100644 --- a/src/main/resources/egovframework/mapper/nlib/col/CartDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/col/CartDAO_SQL.xml @@ -57,6 +57,7 @@ WHERE MB_INFO_ID = #{mbInfoId} AND MASTER_ID = #{masterId} AND DELETE_YN = 'N' + AND IFNULL(A.CART_PROC_DIV_CD, 'N') = 'N' diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp index b72c4606..19a66d4c 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp @@ -158,15 +158,6 @@ function fn_changeCartItems(cartTypeCd, cartTypeNm) { $("#frm").submit(); } - -function fn_changeInterest(masterId, onOff) { - alert("관심등록/삭제 준비중 : " + masterId + ", " + onOff); -} - -function fn_gotoDetail(masterId) { - alert("상세보기 준비중 : " + masterId); -} - // 대출신청으로 이동 function fn_appRent() { @@ -311,17 +302,17 @@ $(document).ready(function() {
${cart.interestYn } - + - + 즐겨찾기 아이콘 즐겨찾기 아이콘 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 @@ -342,7 +333,7 @@ $(document).ready(function() {
-
${cart.title }
+
${cart.title }
poss imposs">

${cart.useStatusNm }

${cart.rtnExpctDd }
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp index d68ca198..58aca0f6 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp @@ -294,7 +294,7 @@ $(document).ready(function() {
에서 @@ -302,7 +302,7 @@ $(document).ready(function() { + >${dtItem.dt } 사이 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp index 35d61c08..bbbb0b65 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp @@ -244,12 +244,12 @@ $(document).ready(function() {
체크 아이콘
- -
자료 ${totCnt}건 방문열람신청이 접수되었습니다. [${readVO.rsrvId}]
+ +
자료 ${totCnt}건 방문열람신청이 접수되었습니다.
(희망방문일자: ${readVO.hopeReqPridDtmFrom} ~ ${readVO.hopeReqPridDtmTo})
 - +
처리에 실패하였습니다.
${readVO.resultMessage } (${readVO.resultCode })
 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp index bd02d913..93fd993b 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp @@ -134,17 +134,19 @@ function fn_search(reqStatusDivCd) { var statusHtml1 = ""; var statusHtml2 = ""; + var statusHtml3 = ""; if(obj.reqStatusDivCd == null) { statusHtml1 = '-'; } else if(obj.reqStatusDivCd == "A0") { // 신청 statusHtml1 = '' + obj.reqStatusDivNm + ''; - statusHtml2 = ''; + statusHtml2 = ''; } else if(obj.reqStatusDivCd == "A1") { // 승인 statusHtml1 = '' + obj.reqStatusDivNm + '' + fn_formatDateStr(obj.modDd,"-") + ''; - statusHtml2 = ''; + statusHtml2 = ''; } else if(obj.reqStatusDivCd == "A2") { // 반려 statusHtml1 = '' + obj.reqStatusDivNm + '' + fn_formatDateStr(obj.modDd,"-") + ''; - statusHtml2 = ''; + statusHtml2 = ''; + statusHtml3 = ''; } else if(obj.reqStatusDivCd == "R") { // 열람완료 statusHtml1 = '' + obj.reqStatusDivNm + '' + fn_formatDateStr(obj.modDd,"-") + ''; statusHtml2 = ''; @@ -153,7 +155,7 @@ function fn_search(reqStatusDivCd) { statusHtml2 = ''; } - div.append($('
').attr('class', 'n-state').html(statusHtml1 + statusHtml2)); + div.append($('
').attr('class', 'n-state').html(statusHtml1 + statusHtml2 + statusHtml3)); $("div.list-data").append(div); @@ -166,6 +168,16 @@ function fn_search(reqStatusDivCd) { alert("조회에 실패하였습니다. 관리자에게 문의 바랍니다."); }); } + + function fn_reson(reqId) { + $("#divRejectedReasonDetail").html($("#rejected_reason_" + reqId).text()); + $("#divRejectedReason").fadeIn(); + } + + function fn_closeReason() { + $("#divRejectedReason").fadeOut(); + $("#divRejectedReasonDetail").html(""); + } function fn_cancel(title, mngOrgCd, reqId, masterId) { @@ -292,3 +304,20 @@ function fn_search(reqStatusDivCd) {
+ +