From 4fa3ec23924b619f32ffcc905e30dbf4a900f113 Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Fri, 8 Dec 2023 15:04:48 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=86=8C=EC=9C=A0=EC=98=88=20?=
 =?UTF-8?q?=EA=B5=90=EC=9C=A1=EB=AA=A9=EB=A1=9D=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/kcc/let/my/web/MyPageController.java    |  5 +++--
 .../sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml |  9 +++++++++
 .../ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp | 16 +++++++---------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java
index dfb82706..6cebe351 100644
--- a/src/main/java/kcc/let/my/web/MyPageController.java
+++ b/src/main/java/kcc/let/my/web/MyPageController.java
@@ -197,10 +197,10 @@ public class MyPageController {
 			vEEduChasiVO.setPageUnit(vEEduAplctVO.getPageUnit());
 			vEEduChasiVO.setPageSize(vEEduAplctVO.getPageSize());
 
-			List<VEEduChasiVO> vEEduChasiVOList = vEEduMIXService.selectChasiListMypage(vEEduChasiVO);
+			List<VEEduChasiVO> adultList = vEEduMIXService.selectChasiListMypage(vEEduChasiVO);
 			
 			
-			 Map<String, String> tngrMap = vEEduChasiVOList.stream()
+			 Map<String, String> tngrMap = adultList.stream()
 												.collect(Collectors.partitioningBy(vo -> "30".equals(vo.getAsgnmAprvlCd()), Collectors.counting()))
 												.entrySet().stream()
 												.collect(Collectors.toMap(
@@ -210,6 +210,7 @@ public class MyPageController {
 											);
 			
 			model.addAttribute("adultMap", tngrMap);
+			model.addAttribute("adultList", adultList);
 		}
 //		return "/web/cop/bbs/FaqListAjax";
 		return "web/my/myPageDashBoard";
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 81f9d216..2495d158 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,6 +672,15 @@
 		<isNotEmpty property="searchEndDt">
 			AND vpap.edu_strt_pnttm <![CDATA[ <= ]]> #searchEndDt#
 		</isNotEmpty>			
+		<isEqual property="searchStatus" compareValue="30">  
+			AND vadi.aplct_state_cd = #searchStatus#
+		</isEqual>			
+		<isEqual property="searchStatus" compareValue="20">  
+			AND vadi.aplct_state_cd = #searchStatus#
+		</isEqual>			
+		<isEqual property="searchStatus" compareValue="10">  
+			AND a.aprvl_cd = #searchStatus#
+		</isEqual>			
 			
 			/*AND a.aprvl_cd != '100' 찜하기 제거*/
 		ORDER BY vpap.edu_strt_pnttm desc
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp
index 72c2fc39..64458d42 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp
@@ -11,10 +11,10 @@
 <un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />
 <title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
-<%-- <spring:eval expression="@property['Globals.Innorix.License']" var="license"/> --%>
-<%-- <script src="<c:url value='/innorix/innorix_${license}.js' />"></script>  --%>
-<%-- <script src="<c:url value='/js/kccadr/innorixCommon.js' />"></script> --%>
-<%-- <link rel="stylesheet" href="<c:url value='/innorix/innorix.css'/>" type="text/css"> --%>
+<spring:eval expression="@property['Globals.Innorix.License']" var="license"/>
+<script src="<c:url value='/innorix/innorix_${license}.js' />"></script> 
+<script src="<c:url value='/js/kccadr/innorixCommon.js' />"></script>
+<link rel="stylesheet" href="<c:url value='/innorix/innorix.css'/>" type="text/css">
 <style>
 	input:disabled {
 		background-color: #f9f9f9 !important;
@@ -414,11 +414,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 30 ? 'selected' : ''} value="30">교육취소</option>
+					<option ${vEPrcsDetailVO.searchStatus eq 20 ? 'selected' : ''} value="20">이수완료</option>
 				</select>
 			</div>
 			<div class="btn_wrap">