From bafbac67ca0aa364ad2be29c971a7678c87d1fa0 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Tue, 14 Oct 2025 11:09:27 +0900
Subject: [PATCH] =?UTF-8?q?2025-10-14=2011:08=20=EA=B3=BC=EC=A0=95=20?=
 =?UTF-8?q?=EC=83=81=ED=83=9C=EB=A5=BC=20=EA=B5=90=EC=9C=A1=ED=99=95?=
 =?UTF-8?q?=EC=A0=95=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EA=B2=BD=EC=9A=B0=EB=A7=8C=20=EC=8A=B9=EC=9D=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EC=8B=A0=EC=B2=AD=EC=9E=90=EB=A5=BC=20=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=ED=99=95=EC=A0=95=20=EB=90=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java  |  5 ++++-
 .../web/CndtnPrcsInfoMngController.java              |  5 ++++-
 .../ve/oprtn/prevent/web/PreventMngController.java   |  5 ++++-
 .../oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp  | 11 +++++++----
 .../cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp | 11 +++++++----
 .../oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp  | 12 ++++++++----
 6 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java
index cfd2b327..c2a12d6e 100644
--- a/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java
@@ -1009,7 +1009,10 @@ public class CmdPrcsInfoMngController {
 				
 				int i_ret	=	0;
 				try {
-					i_ret	=	vEPrcsAplctPrdService.updateStatusChange4User(vEPrcsAplctVO);
+					//과정 상태를 교육 확정으로 변경하는 경우만 교육 승인된 대상자만 확정 처리한다.
+					if ("20".equals(vEPrcsDetailVO.getDdlnCd())) {
+						i_ret	=	vEPrcsAplctPrdService.updateStatusChange4User(vEPrcsAplctVO);	
+					}						
 					
 				}catch(Exception ex) {
 					System.out.println(ex.toString());
diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
index 595c111f..294417fe 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
@@ -1011,7 +1011,10 @@ public class CndtnPrcsInfoMngController {
 				
 				int i_ret	=	0;
 				try {
-					i_ret	=	vEPrcsAplctPrdService.updateStatusChange4User(vEPrcsAplctVO);
+					//과정 상태를 교육 확정으로 변경하는 경우만 교육 승인된 대상자만 확정 처리한다.
+					if ("20".equals(vEPrcsDetailVO.getDdlnCd())) {
+						i_ret	=	vEPrcsAplctPrdService.updateStatusChange4User(vEPrcsAplctVO);	
+					}					
 					
 				}catch(Exception ex) {
 					System.out.println(ex.toString());
diff --git a/src/main/java/kcc/ve/oprtn/prevent/web/PreventMngController.java b/src/main/java/kcc/ve/oprtn/prevent/web/PreventMngController.java
index 7c755ceb..541f5334 100644
--- a/src/main/java/kcc/ve/oprtn/prevent/web/PreventMngController.java
+++ b/src/main/java/kcc/ve/oprtn/prevent/web/PreventMngController.java
@@ -1009,7 +1009,10 @@ public class PreventMngController {
 				
 				int i_ret	=	0;
 				try {
-					i_ret	=	vEPrcsAplctPrdService.updateStatusChange4User(vEPrcsAplctVO);
+					//과정 상태를 교육 확정으로 변경하는 경우만 교육 승인된 대상자만 확정 처리한다.
+					if ("20".equals(vEPrcsDetailVO.getDdlnCd())) {
+						i_ret	=	vEPrcsAplctPrdService.updateStatusChange4User(vEPrcsAplctVO);	
+					}											
 					
 				}catch(Exception ex) {
 					System.out.println(ex.toString());
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp
index e93d6e54..7b28dbdb 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp
@@ -574,11 +574,14 @@
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
 					<button type="button" class="btn_type02" onclick="fncDel(); return false;">삭제</button>
+					<button type="button" class="btn_type02" onclick="fncMdfy(); return false;">수정</button>
 				</div>
 				<div class="btn_center">
+					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(10); return false;">신청마감</button>
+					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(20); return false;">교육확정</button>				
 				</div>
 				<div class="btn_right">					
-					<button type="button" class="btn_type02" onclick="fncMdfy(); return false;">수정</button>
+					
 					<button type="button" class="btn_type03" onclick="fncGoList(); return false;">목록</button>
 				</div>
 			</div>		
@@ -784,13 +787,13 @@
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
 					<button type="button" class="btn_type02" onclick="excelDownLoad(); return false;">엑셀다운로드</button>
-					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(10); return false;">신청마감</button>
-					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(20); return false;">교육확정</button>
+<!-- 					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(10); return false;">신청마감</button> -->
+<!-- 					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(20); return false;">교육확정</button> -->
 				</div>
 				<div class="btn_center">
 				</div>
 				<div class="btn_right">
-					<button type="button" class="btn_type04" onclick="location.href='<c:url value="/kccadr/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngList.do" />'; return false;">강의목록</button>
+<%-- 					<button type="button" class="btn_type04" onclick="location.href='<c:url value="/kccadr/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngList.do" />'; return false;">강의목록</button> --%>
 <%-- 					<button type="button" class="btn_type04" onclick="updateEduAplctOrdList(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>
 					
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp
index 27cff900..ca0c543b 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp
@@ -575,11 +575,14 @@
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
 					<button type="button" class="btn_type02" onclick="fncDel(); return false;">삭제</button>
+					<button type="button" class="btn_type02" onclick="fncMdfy(); return false;">수정</button>
 				</div>
 				<div class="btn_center">
+					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(10); return false;">신청마감</button>
+					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(20); return false;">교육확정</button>				
 				</div>
 				<div class="btn_right">					
-					<button type="button" class="btn_type02" onclick="fncMdfy(); return false;">수정</button>
+					
 					<button type="button" class="btn_type03" onclick="fncGoList(); return false;">목록</button>
 				</div>
 			</div>		
@@ -797,13 +800,13 @@
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
 					<button type="button" class="btn_type02" onclick="excelDownLoad(); return false;">엑셀다운로드</button>
-					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(10); return false;">신청마감</button>
-					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(20); return false;">교육확정</button>
+<!-- 					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(10); return false;">신청마감</button> -->
+<!-- 					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(20); return false;">교육확정</button> -->
 				</div>
 				<div class="btn_center">
 				</div>
 				<div class="btn_right">
-					<button type="button" class="btn_type04" onclick="location.href='<c:url value="/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList.do" />'; return false;">강의목록</button>
+<%-- 					<button type="button" class="btn_type04" onclick="location.href='<c:url value="/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList.do" />'; return false;">강의목록</button> --%>
 <%-- 					<button type="button" class="btn_type04" onclick="updateEduAplctOrdList(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>
 					
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp
index c829cb44..b4bb7655 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp
@@ -574,11 +574,16 @@
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
 					<button type="button" class="btn_type02" onclick="fncDel(); return false;">삭제</button>
+					<button type="button" class="btn_type02" onclick="fncMdfy(); return false;">수정</button>
 				</div>
 				<div class="btn_center">
+				
+					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(10); return false;">신청마감</button>
+					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(20); return false;">교육확정</button>				
+				
 				</div>
 				<div class="btn_right">					
-					<button type="button" class="btn_type02" onclick="fncMdfy(); return false;">수정</button>
+					
 					<button type="button" class="btn_type03" onclick="fncGoList(); return false;">목록</button>
 				</div>
 			</div>		
@@ -784,13 +789,12 @@
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
 					<button type="button" class="btn_type02" onclick="excelDownLoad(); return false;">엑셀다운로드</button>
-					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(10); return false;">신청마감</button>
-					<button type="button" class="btn_type04" onclick="fncDdlnCdSave(20); return false;">교육확정</button>
+
 				</div>
 				<div class="btn_center">
 				</div>
 				<div class="btn_right">
-					<button type="button" class="btn_type04" onclick="location.href='<c:url value="/kccadr/oprtn/prevent/cndtnEduPrcsAplctPrdMngList.do" />'; return false;">강의목록</button>
+<%-- 					<button type="button" class="btn_type04" onclick="location.href='<c:url value="/kccadr/oprtn/prevent/cndtnEduPrcsAplctPrdMngList.do" />'; return false;">강의목록</button> --%>
 <%-- 					<button type="button" class="btn_type04" onclick="updateEduAplctOrdList(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>