From 385f73ed33fdeb3f2836d9eb18eda8deafab263b Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Wed, 29 Nov 2023 17:56:41 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EC=9A=A9=20=EC=BD=94=EB=93=9C=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=20=EB=B0=8F=20=EC=B2=AD=EC=86=8C=EB=85=84=20=EA=B0=95?=
 =?UTF-8?q?=EC=82=AC=20=EC=88=99=EB=B0=95=EC=8B=A0=EC=B2=AD=20=EC=8B=9C=20?=
 =?UTF-8?q?=EA=B5=90=EC=9C=A1=EC=9D=BC=EC=9E=90=20=EC=B2=B4=ED=81=AC=20?=
 =?UTF-8?q?=ED=9B=84=20=EB=A7=88=EA=B0=90=20=EC=B2=98=EB=A6=AC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/VEEduAplctServiceImpl.java   |  1 -
 .../asgnmInfo/instrAsgnmDetail.jsp            | 19 +++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java
index d5054f9c..b4d50ade 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java
@@ -141,7 +141,6 @@ public class VEEduAplctServiceImpl implements VEEduAplctService {
 			vEEduAplctVO.setMngNmbrOrd(vo.getMngNmbrOrd());
 		}
 		
-		if(true) return 0;
 		return vEEduAplctDAO.statusUpdate(vEEduAplctVO);
 	}
 
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
index 49c8d27a..a4357c01 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
@@ -665,9 +665,19 @@
 						<th scope="row">
 							<p>숙박신청여부</p>
 						</th>
+						<!-- 교육일자가 지났을 시 숙박신청 막기 -->
+						<c:set var="now" value="<%=new java.util.Date()%>" />
+						<c:set var="today"><fmt:formatDate value="${now}" pattern="yyyyMMdd" /></c:set> 
+						<c:set var="eduDt" value="${fn:replace(info.eduHopeDt, '.', '')}" />
+						
 						<c:if test="${acmdtAplctCheck eq 'N'}">
 						<td colspan="4">
-							<button type="button" class="btnType01" data-tooltip="sub51_pop01" title="팝업 열림">숙박 신청</button>
+							<c:if test="${eduDt <= today}">
+								마감
+							</c:if>
+							<c:if test="${eduDt > today}">
+								<button type="button" class="btnType01" data-tooltip="sub51_pop01" title="팝업 열림">숙박 신청</button>
+							</c:if>
 						</td>
 						</c:if>
 						<c:if test="${acmdtAplctCheck eq 'Y'}">
@@ -697,7 +707,12 @@
 						</th>
 						<c:if test="${acmdtAplctCheck eq 'N'}">
 						<td>
-							<button type="button" class="btnType01" data-tooltip="sub51_pop01" title="팝업 열림">숙박 신청</button>
+							<c:if test="${eduDt < today}">
+								마감
+							</c:if>
+							<c:if test="${eduDt >= today}">
+								<button type="button" class="btnType01" data-tooltip="sub51_pop01" title="팝업 열림">숙박 신청</button>
+							</c:if>
 						</td>
 						</c:if>
 						<c:if test="${acmdtAplctCheck eq 'Y'}">