From 437ed46e5eb08502c20b71af31ce75d36257d1b1 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 15 Feb 2024 17:26:13 +0900
Subject: [PATCH] =?UTF-8?q?2024-02-15=2017:25=20=EC=B2=AD=EC=86=8C?=
 =?UTF-8?q?=EB=85=84=20=EA=B0=95=EC=82=AC=20=EA=B0=95=EC=82=AC=EB=A3=8C=20?=
 =?UTF-8?q?excel=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml    | 19 ++++++++++---------
 .../tngrVisitEdu/eduAsgnmCnfrmMngList.jsp     |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
index 691021ed..1d29ea0d 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
@@ -897,7 +897,14 @@
 		</isNotEmpty>
 
 		<isNotEmpty property="searchAcmdtCnt">
-		
+			<isEqual property="searchAcmdtCnt" compareValue="40">
+			    AND J.sbmt_yn='Y'
+			    AND J.aprvl_cd ='10'				   
+			</isEqual>
+			<isEqual property="searchAcmdtCnt" compareValue="50">
+			    AND J.sbmt_yn='Y'
+			    AND J.aprvl_cd ='20'				   
+			</isEqual>									
 			<isEqual property="searchAcmdtCnt" compareValue="20">
 			    AND J.sbmt_yn='Y'
 			    AND J.aprvl_cd is null				   
@@ -905,14 +912,8 @@
 			<isEqual property="searchAcmdtCnt" compareValue="30">
 			    AND NVL(J.sbmt_yn,'N')='N'			    				   
 			</isEqual>
-			<isEqual property="searchAcmdtCnt" compareValue="40">
-			    AND J.sbmt_yn='Y'
-			    AND J.aprvl_cd ='40'				   
-			</isEqual>
-			<isEqual property="searchAcmdtCnt" compareValue="50">
-			    AND J.sbmt_yn='Y'
-			    AND J.aprvl_cd ='50'				   
-			</isEqual>				
+
+
 		
 		/*
 			AND 
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngList.jsp
index ddb623ec..567f6fde 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngList.jsp
@@ -359,10 +359,10 @@
 										
 										<c:choose>
 											<c:when test="${list.acmdtSbmtYn eq 'Y' and list.acmdtAprvlCd eq '10'}">
-												확정
+												승인
 											</c:when>
 											<c:when test="${list.acmdtSbmtYn eq 'Y' and list.acmdtAprvlCd eq '20'}">
-												반려
+												미승인
 											</c:when>
 											<c:when test="${list.acmdtSbmtYn eq 'Y'}">
 												<button class="btn_type06"