Merge branch 'JIWOO' into advc

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);
 	}
 

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">
+							<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>
+							<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'}">