From 933a72619bc5b491d4f3eb7a67433ce855005746 Mon Sep 17 00:00:00 2001
From: KNKIM <knkim@digitalship.co.kr>
Date: Tue, 26 Oct 2021 18:12:48 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8C=80=EC=B6=9C=EC=8B=A0=EC=B2=AD=20?=
 =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=ED=99=94=EB=A9=B4=20=EA=B0=9C=EB=B0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/nlib/col/service/impl/RentServiceImpl.java  | 12 +++++++++++-
 src/main/java/nlib/col/web/RentController.java       | 12 ++++++++----
 .../webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp     | 10 +++++++++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/java/nlib/col/service/impl/RentServiceImpl.java b/src/main/java/nlib/col/service/impl/RentServiceImpl.java
index 9197bd38..772195b6 100644
--- a/src/main/java/nlib/col/service/impl/RentServiceImpl.java
+++ b/src/main/java/nlib/col/service/impl/RentServiceImpl.java
@@ -118,12 +118,22 @@ public class RentServiceImpl implements RentService
     		resVO = dataApi.request(reqVO);
     		cVO.setResult(resVO.getResultCode(), resVO.getResultMessage());
     		
-    		// 대출예약번호 설정 (rsrvId)
+    		// 대출예약번호/일자 설정 (rsrvId)
     		if(StringUtil.startsWithIgnoreCase(resVO.getResultCode(), "S")) {
     			cVO.setRsrvId(resVO.getInfoItem("rsrvId", ""));
+    			cVO.setRsrvDd(StringUtil.formatDateStr(resVO.getInfoItem("rsrvDd", ""), "")); 
+    			
+        		// 대출신청, 대출예약 구분 : API 팀에서 처리완료시까지 임시 데이터 설정 DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDd
+    			cVO.setBookLtRvStatusCd("1"); // 대출상태구분코드
+    			cVO.setBookLtRvStatusNm("대출신청"); // 대출상태구분코드명
+    			//cVO.setBookLtRvStatusCd("2"); // 대출상태구분코드
+    			//cVO.setBookLtRvStatusNm("대출예약"); // 대출상태구분코드명
+    			
     		} else {
     			cVO.setRsrvId(null);
+    			cVO.setRsrvDd(null);
     		}
+    		
     	}
     	
 		return list;
diff --git a/src/main/java/nlib/col/web/RentController.java b/src/main/java/nlib/col/web/RentController.java
index 6f294724..41688c66 100644
--- a/src/main/java/nlib/col/web/RentController.java
+++ b/src/main/java/nlib/col/web/RentController.java
@@ -182,9 +182,10 @@ public class RentController extends NlibCommonController
     	return "nlib/rent/confirmRent";
     }
     
-    @RequestMapping(value={"/rent/insertRentItems.do"})
+    @RequestMapping(value={"/rent/insertRentItemsFromCart.do", "/rent/insertRentItems.do"})
     public String insertRentItems(HttpServletRequest request, CollectionVO rentVO, ModelMap model) throws Exception {
     	
+    	boolean fromCart = request.getServletPath().contains("Cart.do");
     	String retJsp = "nlib/rent/insertRentItems";
     	String mbInfoId = getMbInfoId(request);
     	
@@ -205,16 +206,19 @@ public class RentController extends NlibCommonController
     	
 		String selItems = rentVO.getSelItems();
 		
-		List<CollectionVO> list = collectionService.makeInfoListOfCollectionVO(selItems, mbInfoId, NlibProperty.getString("thumbnail.image.url.small"));
-		list = rentService.insertRentItems(list, mbInfoId, rentVO.getMngOrgCd());
+		List<CollectionVO> list = collectionService.makeListOfCollectionVO(selItems);
+		
+		// 임시 막음 DDDDDDDDDDDDDDDDDDDDDDDdd
+		//list = rentService.insertRentItems(list, mbInfoId, rentVO.getMngOrgCd());
+		list = collectionService.setDetailInfoForList(list, mbInfoId, NlibProperty.getString("thumbnail.image.url.small"));
 		
 		model.addAttribute("rentVO", rentVO);
     	model.addAttribute("list", list);
+    	if(fromCart) model.addAttribute("fromCart", fromCart ? "Y" : "N");
     	
     	return retJsp;
     }
     
-    
 	
 	
 //
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
index 9d009e0b..ae3512a6 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
@@ -103,7 +103,14 @@ function fn_insertRentItems() {
 	        return;
 	    }
 	    
-	    $("#frm").attr("action","${pageContext.request.contextPath}/rent/insertRentItems.do");
+	    <c:if test='${fromCart == "Y" }'>
+	    $("#frm").attr("action","${pageContext.request.contextPath}/rent/insertRentItemsFromCart.do");
+        </c:if>
+
+        <c:if test='${fromCart != "Y" }'>
+        $("#frm").attr("action","${pageContext.request.contextPath}/rent/insertRentItems.do");
+        </c:if>
+
 	    $("#frm").submit();    
     </sec:authorize>
     
@@ -145,6 +152,7 @@ $(document).ready(function() {
 <form name="frm" id="frm" action="${pageContext.request.contextPath}/cart/listCartItems.do" method="post"> 
       <input type="text" id="cartTypeCd" name="cartTypeCd" value="${rentVO.cartTypeCd }" />
       <input type="text" id="mngOrgCd" name="mngOrgCd" value="${rentVO.mngOrgCd }" />
+      <input type="text" id="mngOrgNm" name="mngOrgNm" value="${rentVO.mngOrgNm }" />
       
       
     <!-- 카트 섹션 -->