2024-02-15 17:25 청소년 강사 강사료 excel 오류 수정

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 

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"