From 1f9ef208a3880a9d4efa31c48ac9bb0685142a2f Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 18 Mar 2024 17:49:50 +0900
Subject: [PATCH] =?UTF-8?q?2024-03-18=2017:49=20=EC=8B=A4=EB=AC=B4?=
 =?UTF-8?q?=EC=97=AD=EB=9F=89=EA=B0=95=ED=99=94=20=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90=20=EC=8A=B9=EC=9D=B8=20=EC=B2=98=EB=A6=AC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/VEPrcsAplctPrdServiceImpl.java  | 16 ++++++++++++++++
 .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml      |  6 ++++++
 .../sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml         |  6 ++++++
 .../fndthEduPrcsAplctPrdMngDetail.jsp            |  3 ++-
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java
index 3e23eaec..e763f093 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java
@@ -288,6 +288,22 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
 			vEPrcsMIXDAO.deleteAplctDetailInfo(vEPrcsDetailVO);									
 			//vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
 
+		}else if ("3".equals(vEPrcsDetailVO.getReqNo())) {
+			//대상자 교육신청후 관리자가 교육승인 
+			//ve_prcs_aplct_prd		:	처리 없음	
+			//ve_edu_aplct			:	update aprvl_cd=20
+			//vea_aplct_detail_info	:	update aplct_state_cd=null
+			
+			VEEduAplctVO	vEEduAplctVO	=	new	VEEduAplctVO();
+			vEEduAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd());
+			
+			//vEPrcsAplctPrdDAO.delete(vEPrcsDetailVO);
+
+			//vEEduAplctDAO.delete(vEEduAplctVO);			
+			vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
+			vEPrcsMIXDAO.updateAplctDetailInfo(vEPrcsDetailVO);
+			//vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
+			
 		}else if ("4".equals(vEPrcsDetailVO.getReqNo())) {
 			//대상자 교육신청후 관리자가 반려 처리 
 			//ve_prcs_aplct_prd		:	처리 없음	
diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
index 2a1c2b4f..51ced6aa 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
@@ -1051,6 +1051,12 @@
 			 LAST_UPDT_PNTTM		= SYSDATE
 			,LAST_UPDUSR_ID		= #lastUpdusrId#
 
+			<isEqual property="reqNo" compareValue="3">
+				/*	확정 후 취소 요청		edu_state_cd=30,req_state_cd=20	*/							   
+				, aprvl_cd				= '20'  
+												
+			</isEqual>	
+			
 			<isEqual property="reqNo" compareValue="4">
 				/*	확정 후 취소 요청		edu_state_cd=30,req_state_cd=20	*/							   
 				, aprvl_cd				= '30'  
diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml
index 9568ba05..5a0aaff6 100644
--- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml
@@ -632,6 +632,12 @@
 			 LAST_UPDT_PNTTM = SYSDATE
 			,LAST_UPDUSR_ID	= #lastUpdusrId#
 					
+			<isEqual property="reqNo" compareValue="3">
+				/*	신청 후 관리자 반려		aplct_state_cd=50	*/							   
+				, aplct_state_cd			= null   
+												
+			</isEqual>
+			
 			<isEqual property="reqNo" compareValue="4">
 				/*	신청 후 관리자 반려		aplct_state_cd=50	*/							   
 				, aplct_state_cd			= '50'   
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp
index 8524191f..7b7b1a41 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp
@@ -757,7 +757,8 @@
 					<button type="button" class="btn_type04" onclick="location.href='<c:url value="/kccadr/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.do" />'; return false;">강의목록</button>
 <%-- 					<button type="button" class="btn_type04" onclick="updateEduAplctOrd(30, '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">접수취소(반려)</button> --%>
 					<button type="button" class="btn_type04" onclick="fncCancelUserList('<c:out value="${info.prcsAplctPrdOrd }" />','4'); return false;">접수취소(반려)</button>
-					<button type="button" class="btn_type04" onclick="updateEduAplctOrd(20, '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">교육승인</button>
+<%-- 					<button type="button" class="btn_type04" onclick="updateEduAplctOrd(20, '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">교육승인</button> --%>
+					<button type="button" class="btn_type04" onclick="fncCancelUserList('<c:out value="${info.prcsAplctPrdOrd }" />','3'); return false;">교육승인</button>
 					
 				</div>
 			</div>