From aaff58a3e802e51b9ec83e217e34910c85773857 Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Tue, 12 Dec 2023 12:12:03 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=A4=EB=AC=B4=EC=97=AD=EB=9F=89=EA=B0=95?=
 =?UTF-8?q?=ED=99=94=20=EB=82=98=EC=9D=98=EA=B0=95=EC=9D=98=EC=8B=A4=20-?=
 =?UTF-8?q?=20=EC=8B=A0=EC=B2=AD=EC=A4=91=EA=B0=95=EC=9D=98/=EC=88=98?=
 =?UTF-8?q?=EA=B0=95=EC=A4=91=EA=B0=95=EC=9D=98/=EC=A2=85=EB=A3=8C?=
 =?UTF-8?q?=EB=90=9C=EA=B0=95=EC=9D=98/=20=EB=A7=81=ED=81=AC=20=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml |  9 ++++++---
 .../aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp  |  8 +++-----
 .../jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp    | 16 +++++++++++++---
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml
index 2495d158..b5af3c9f 100644
--- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml
@@ -672,13 +672,16 @@
 		<isNotEmpty property="searchEndDt">
 			AND vpap.edu_strt_pnttm <![CDATA[ <= ]]> #searchEndDt#
 		</isNotEmpty>			
-		<isEqual property="searchStatus" compareValue="30">  
+		<isEqual property="searchStatus" compareValue="5">  /*VEA003 미이수 : 수강중 강의*/
+			AND vadi.aplct_state_cd = '10'
+		</isEqual>			
+		<isEqual property="searchStatus" compareValue="30">  /*취소 : 취소*/
 			AND vadi.aplct_state_cd = #searchStatus#
 		</isEqual>			
-		<isEqual property="searchStatus" compareValue="20">  
+		<isEqual property="searchStatus" compareValue="20">  /*이수완료 : 종료 강의*/
 			AND vadi.aplct_state_cd = #searchStatus#
 		</isEqual>			
-		<isEqual property="searchStatus" compareValue="10">  
+		<isEqual property="searchStatus" compareValue="10">  /*요청 : 요청 강의*/
 			AND a.aprvl_cd = #searchStatus#
 		</isEqual>			
 			
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp
index a5ef26fe..865453bf 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp
@@ -309,11 +309,9 @@ $(document).ready(function(){
 				<label for="searchStatus" class="label">신청상태 선택</label>
 				<select class="selType1" id="searchStatus" name="searchStatus">
 					<option ${vEPrcsDetailVO.searchStatus eq '' ? 'selected' : ''}  value="">전체</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_SBMT ? 'selected' : ''} value="${VeConstants.STATUS_CD_SBMT}">교육신청</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDT_REQ ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_REQ}">수정요청</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDT_CMPT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_CMPT}">수정완료</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_CAN ? 'selected' : ''} value="${VeConstants.STATUS_CD_CAN}">교육취소</option>
-					<option ${vEPrcsDetailVO.searchStatus eq VeConstants.STATUS_CD_EDU_SELCT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDU_SELCT}">교육확정</option>					
+					<option ${vEPrcsDetailVO.searchStatus eq 10 ? 'selected' : ''} value="10">교육신청</option>
+					<option ${vEPrcsDetailVO.searchStatus eq 5 ? 'selected' : ''} value="5">미이수</option>
+					<option ${vEPrcsDetailVO.searchStatus eq 20 ? 'selected' : ''} value="20">이수완료</option>
 				</select>
 			</div>
 			<div class="btn_wrap">
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp
index d9b4b8c0..cac54d94 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp
@@ -99,11 +99,21 @@
 		$('#target_confirm_popup-close').click();
 	}
 	
+	function fn_goListForm(data){
+		var form = document.goListForm ;
+		form.searchStatus.value = data ;
+		form.submit();
+		
+	}
+	
 </script>
 
 <!-- content -->
 <div class="cont_wrap" id="sub">
 
+	<form id="goListForm" name="goListForm" action="<c:url value="/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.do" />" method="post">
+			<input type="hidden" id="searchStatus" name="searchStatus" />
+	</form>
 	<form:form id="listForm" name="listForm" commandName="vEEduAplctVO">
 
 		<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="" />
@@ -111,13 +121,13 @@
 			<h2>나의강의실</h2>
 		</div>
 		 <ul class="edu_process">
-			<li class="edu_apply" style="cursor: pointer;" onclick="location.href='<c:url value="/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.do" />'"><i></i>
+			<li class="edu_apply" style="cursor: pointer;" onclick="fn_goListForm(5)"><i></i>
 				<div class="text_area">신청중 강의<p><span><c:out value="${countMap['COUNT_APRVL_CD_10']}" /></span>건</p></div>
 			</li> 
-			<li class="edu_register" style="cursor: pointer;" onclick="location.href='<c:url value="/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.do" />'"><i></i>
+			<li class="edu_register" style="cursor: pointer;" onclick="fn_goListForm(10)"><i></i>
 				<div class="text_area">수강중 강의<p><span><c:out value="${countMap['COUNT_APRVL_CD_20']}" /></span>건</p></div>
 			</li>
-			<li class="edu_close" style="cursor: pointer;" onclick="location.href='<c:url value="/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.do" />'"><i></i>
+			<li class="edu_close" style="cursor: pointer;" onclick="fn_goListForm(20)"><i></i>
 				<div class="text_area">종료된 강의<p><span><c:out value="${countMap['COUNT_END_CD']}" /></span>건</p></div>
 			</li>  
 		</ul>