From 15a9481cc00535ae5c5802b371a71a64f1f62cf5 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 13 Oct 2025 15:04:46 +0900
Subject: [PATCH] =?UTF-8?q?2025-10-13=2015:04=20=EA=B5=90=EC=9C=A1?=
 =?UTF-8?q?=EC=9D=B4=EC=88=98=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp | 36 ++++++++--------
 .../cndtnEduPrcsAplctCfnMngDetail.jsp         | 42 ++++++++++---------
 .../prevent/cndtnEduPrcsAplctCfnMngDetail.jsp | 34 ++++++++-------
 3 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
index 2e2a8cc4..5add974f 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -786,7 +786,7 @@
 						<th>주민번호 앞자리</th>
 						<th>이메일</th>
 						<th>연락처</th>
-						<th>교육이수여부</th>						
+						<th>교육이수상태</th>						
 						<th>교육이수상태변경</th>					
 						<th>취소상태</th>					
 						
@@ -826,15 +826,15 @@
 											<c:out value="${list.phone}"/>
 										</td>
 										<td>
-<%-- 											<ve:code codeId="VEA002" code="${list.eduStateCd}"/> --%>
-											<c:choose>
-												<c:when test="${list.aplctStateCd eq 10 or list.aplctStateCd eq 60}">													
-													<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>													
-												</c:when>
-												<c:otherwise>
-													<ve:code codeId="VEA002" code="${list.eduStateCd}"/>
-												</c:otherwise>
-											</c:choose>
+											<ve:code codeId="VEA003" code="${list.eduStateCd}"/>
+<%-- 											<c:choose> --%>
+<%-- 												<c:when test="${list.aplctStateCd eq 10 or list.aplctStateCd eq 60}">													 --%>
+<%-- 													<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>													 --%>
+<%-- 												</c:when> --%>
+<%-- 												<c:otherwise> --%>
+<%-- 													<ve:code codeId="VEA002" code="${list.eduStateCd}"/> --%>
+<%-- 												</c:otherwise> --%>
+<%-- 											</c:choose> --%>
 										</td>
 										<td>
 											<c:if test="${list.aprvlCd ne '40'}"><!-- 취소 승인 상태는 변경 불가능 하도록 수정-->
@@ -899,11 +899,14 @@
 			</div>
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
+					<button type="button" class="btn_type08" onclick="fncExcel();">교육신청자 엑셀 다운로드</button>
 				</div>
 				<div class="btn_center">
 				</div>
 				<div class="btn_right">
-					<button type="button" class="btn_type08" onclick="fncExcel();">교육신청자 엑셀 다운로드</button>
+					
+					<button type="button" class="btn_type04" onclick="fn_statusChgList('20', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">이수</button>
+					<button type="button" class="btn_type04" onclick="fn_statusChgList('10', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">미이수</button>					
 				</div>
 			</div>				
 			
@@ -920,12 +923,11 @@
 					<tbody>
 					<tr>
 						<th scope="row">
-							<p>SMS 내용</p>
+							<p>내용</p>
 						</th>
 						<td class="tb_alram">
 							<div>
-								<textarea id="smsMsg"></textarea>
-								<button type="button" class="btn_type08" onclick="chkSnd('sms');return false;">SMS 발송</button>
+								<textarea id="smsMsg"></textarea>								
 							</div>
 							<!-- <p><span id="byteSms">0</span>/90 byte</p> -->
 						</td>
@@ -955,9 +957,9 @@
 				</div>
 				<div class="btn_right">
 					<button type="button" class="btn_type08" onclick="chkSnd('email');return false;">email 발송</button>
-					<button type="button" class="btn_type04" onclick="location.href='<c:url value="/kccadr/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngList.do" />'; return false;">교육확정목록</button>
-					<button type="button" class="btn_type04" onclick="fn_statusChgList('20', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">이수</button>
-					<button type="button" class="btn_type04" onclick="fn_statusChgList('10', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">미이수</button>
+					<button type="button" class="btn_type08" onclick="chkSnd('sms');return false;">SMS 발송</button>
+<%-- 					<button type="button" class="btn_type04" onclick="location.href='<c:url value="/kccadr/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngList.do" />'; return false;">교육확정목록</button> --%>
+
 				</div>
 			</div>					
 				
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
index f561fb81..3648521b 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -797,7 +797,7 @@
 						<th>주민번호 앞자리</th>
 						<th>이메일</th>
 						<th>연락처</th>
-						<th>교육이수여부</th>						
+						<th>교육이수상태</th>						
 						<th>교육이수상태변경</th>					
 						<th>취소상태</th>					
 						
@@ -837,15 +837,15 @@
 											<c:out value="${list.phone}"/>
 										</td>
 										<td>
-<%-- 											<ve:code codeId="VEA002" code="${list.eduStateCd}"/> --%>
-											<c:choose>
-												<c:when test="${list.aplctStateCd eq 10 or list.aplctStateCd eq 60}">													
-													<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>													
-												</c:when>
-												<c:otherwise>
-													<ve:code codeId="VEA002" code="${list.eduStateCd}"/>
-												</c:otherwise>
-											</c:choose>
+											<ve:code codeId="VEA003" code="${list.eduStateCd}"/>
+<%-- 											<c:choose> --%>
+<%-- 												<c:when test="${list.aplctStateCd eq 10 or list.aplctStateCd eq 60}">													 --%>
+<%-- 													<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>													 --%>
+<%-- 												</c:when> --%>
+<%-- 												<c:otherwise> --%>
+<%-- 													<ve:code codeId="VEA002" code="${list.eduStateCd}"/> --%>
+<%-- 												</c:otherwise> --%>
+<%-- 											</c:choose> --%>
 										</td>
 										<td>
 											<c:if test="${list.aprvlCd ne '40'}"><!-- 취소 승인 상태는 변경 불가능 하도록 수정-->
@@ -910,13 +910,17 @@
 			</div>
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
+					<button type="button" class="btn_type08" onclick="fncExcel();">교육신청자 엑셀 다운로드</button>
 				</div>
 				<div class="btn_center">
 				</div>
 				<div class="btn_right">
-					<button type="button" class="btn_type08" onclick="fncExcel();">교육신청자 엑셀 다운로드</button>
+
+					<button type="button" class="btn_type04" onclick="fn_statusChgList('20', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">이수</button>
+					<button type="button" class="btn_type06" onclick="fn_statusChgList('10', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">미이수</button>
 				</div>
-			</div>				
+			</div>		
+			<br/>		
 			
 			
 			<div class="tb_tit01">
@@ -931,12 +935,11 @@
 					<tbody>
 					<tr>
 						<th scope="row">
-							<p>SMS 내용</p>
+							<p>내용</p>
 						</th>
 						<td class="tb_alram">
 							<div>
-								<textarea id="smsMsg"></textarea>
-								<button type="button" class="btn_type06" onclick="chkSnd('sms');return false;">SMS 발송</button>
+								<textarea id="smsMsg"></textarea>								
 							</div>
 							<!-- <p><span id="byteSms">0</span>/90 byte</p> -->
 						</td>
@@ -961,15 +964,16 @@
 			<!-- btn_wrap -->
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
-					<button type="button" class="btn_type08" onclick="chkSnd('email');return false;">email 발송</button>
+						
 				</div>
 				<div class="btn_center">
 				</div>
 				<div class="btn_right">
-					<button type="button" class="btn_type04" onclick="fn_statusChgList('20', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">이수</button>
-					<button type="button" class="btn_type06" onclick="fn_statusChgList('10', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">미이수</button>
+						
+						<button type="button" class="btn_type08" onclick="chkSnd('email');return false;">email 발송</button>
+						<button type="button" class="btn_type06" onclick="chkSnd('sms');return false;">SMS 발송</button>
 					
-					<button type="button" class="btn_type03" onclick="location.href='<c:url value="/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.do" />'; return false;">교육확정목록</button>
+<%-- 					<button type="button" class="btn_type03" onclick="location.href='<c:url value="/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.do" />'; return false;">교육확정목록</button> --%>
 				</div>
 			</div>					
 				
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
index e5df6f5c..aa71864c 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -786,7 +786,7 @@
 						<th>주민번호 앞자리</th>
 						<th>이메일</th>
 						<th>연락처</th>
-						<th>교육이수여부</th>						
+						<th>교육이수상태</th>						
 						<th>교육이수상태변경</th>					
 						<th>취소상태</th>					
 						
@@ -826,15 +826,15 @@
 											<c:out value="${list.phone}"/>
 										</td>
 										<td>
-<%-- 											<ve:code codeId="VEA002" code="${list.eduStateCd}"/> --%>
-											<c:choose>
-												<c:when test="${list.aplctStateCd eq 10 or list.aplctStateCd eq 60}">													
-													<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>													
-												</c:when>
-												<c:otherwise>
-													<ve:code codeId="VEA002" code="${list.eduStateCd}"/>
-												</c:otherwise>
-											</c:choose>
+											<ve:code codeId="VEA003" code="${list.eduStateCd}"/>
+<%-- 											<c:choose> --%>
+<%-- 												<c:when test="${list.aplctStateCd eq 10 or list.aplctStateCd eq 60}">													 --%>
+<%-- 													<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>													 --%>
+<%-- 												</c:when> --%>
+<%-- 												<c:otherwise> --%>
+<%-- 													<ve:code codeId="VEA002" code="${list.eduStateCd}"/> --%>
+<%-- 												</c:otherwise> --%>
+<%-- 											</c:choose> --%>
 										</td>
 										<td>
 											<c:if test="${list.aprvlCd ne '40'}"><!-- 취소 승인 상태는 변경 불가능 하도록 수정-->
@@ -899,11 +899,13 @@
 			</div>
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
+					<button type="button" class="btn_type08" onclick="fncExcel();">교육신청자 엑셀 다운로드</button>
 				</div>
 				<div class="btn_center">
 				</div>
 				<div class="btn_right">
-					<button type="button" class="btn_type08" onclick="fncExcel();">교육신청자 엑셀 다운로드</button>
+					<button type="button" class="btn_type04" onclick="fn_statusChgList('20', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">이수</button>
+					<button type="button" class="btn_type04" onclick="fn_statusChgList('10', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">미이수</button>					
 				</div>
 			</div>				
 			
@@ -920,12 +922,12 @@
 					<tbody>
 					<tr>
 						<th scope="row">
-							<p>SMS 내용</p>
+							<p> 내용</p>
 						</th>
 						<td class="tb_alram">
 							<div>
 								<textarea id="smsMsg"></textarea>
-								<button type="button" class="btn_type08" onclick="chkSnd('sms');return false;">SMS 발송</button>
+								
 							</div>
 							<!-- <p><span id="byteSms">0</span>/90 byte</p> -->
 						</td>
@@ -955,9 +957,9 @@
 				</div>
 				<div class="btn_right">
 					<button type="button" class="btn_type08" onclick="chkSnd('email');return false;">email 발송</button>
-					<button type="button" class="btn_type04" onclick="location.href='<c:url value="/kccadr/oprtn/prevent/cndtnEduPrcsAplctCfnMngList.do" />'; return false;">교육확정목록</button>
-					<button type="button" class="btn_type04" onclick="fn_statusChgList('20', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">이수</button>
-					<button type="button" class="btn_type04" onclick="fn_statusChgList('10', '<c:out value="${info.prcsAplctPrdOrd }" />'); return false;">미이수</button>
+					<button type="button" class="btn_type08" onclick="chkSnd('sms');return false;">SMS 발송</button>
+<%-- 					<button type="button" class="btn_type04" onclick="location.href='<c:url value="/kccadr/oprtn/prevent/cndtnEduPrcsAplctCfnMngList.do" />'; return false;">교육확정목록</button> --%>
+
 				</div>
 			</div>