From 9fc2876a751fdb440025c02a8472355040e28b87 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 23 Oct 2025 17:12:39 +0900
Subject: [PATCH] =?UTF-8?q?2025-10-23=2017:12=20=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90=EC=9A=A9=20=EC=84=A4=EB=AC=B8,=20=EC=9D=B4=EC=88=98?=
 =?UTF-8?q?=EC=A6=9D=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp | 57 +++++++++++++++++-
 .../cndtnEduPrcsAplctCfnMngDetail.jsp         | 27 +++++++--
 .../prevent/cndtnEduPrcsAplctCfnMngDetail.jsp | 59 ++++++++++++++++++-
 3 files changed, 133 insertions(+), 10 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 2de505d7..8d3ad4bf 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -776,7 +776,7 @@
 						<col style="width: 210px;">			
 						<col style="width: 250px;">
 						
-<%-- 						<col style="width: 140px;">			 --%>
+						<col style="width: 140px;">			
 					</colgroup>
 					<thead>
 					<tr>
@@ -790,7 +790,7 @@
 						<th>교육이수상태변경</th>					
 						<th>취소상태</th>					
 						
-<!-- 						<th>이수증</th>							 -->
+						<th>내용확인</th>							
 					</tr>
 					</thead>					
 					<tbody>
@@ -883,6 +883,59 @@
 												</c:otherwise>
 											</c:choose>			
 										</td>	
+										<td>
+										
+							<c:choose>
+								<c:when test="${list.aprvlCd eq 60 and list.qestRsltExists}">
+								<!-- 설문노출대상(확정처리를 받았음(60) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
+
+									<c:choose>
+										
+										<c:when test="${list.qestnrId10Cnt gt 0}">
+										<!-- 작성된 설문이 있다 -->
+											<button type="button" class="btn_type04" data-tooltip="sub37_pop20" 
+											onclick="fncInstrCostNewInfo('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
+											,'${list.qustnrTmplatId}','${list.qestnrId10}',''
+											)" title="팝업 열림">설문완료</button>
+										</c:when>
+										
+										<c:when test="${empty list.qestnrId10}">
+										<!-- 대상 설문이 없다 -->
+											대상설문없음									
+										</c:when>		
+										
+										<c:when test="${not empty list.qestnrId10 and list.qestnrId10Cnt eq 0 and list.qustnrTm eq '1'}">
+										<!-- 설문 키값이 있고, 답변이 없고, 설문 오픈 시간이 지났다(1), (0-지나기전)면 설문 등록을 연다 -->										
+										<!-- 작성된 설문이 없다 -->
+											등록된 설문없음						
+										</c:when>
+								
+										<c:otherwise>
+											-
+										</c:otherwise>
+									</c:choose>	
+
+								</c:when>
+								<c:otherwise>
+								<!-- 설문노출대상 아님 -->
+									-
+								</c:otherwise>
+							</c:choose>										
+											
+											
+
+							<c:choose>
+								<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20'}">
+								<!-- 교육 기간 종료 & 교육신청은 확정(60) & 교육상태는 이슈(20) & 수료증 출력 가능 -->
+									<button type="button" class="btn_type04" 
+									onclick="fncPrintCert('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert','${list.qustnrTmplatId}','${list.qestnrId10}','')"/>출력</button>
+								</c:when>
+								<c:otherwise>
+									-
+								</c:otherwise>
+							</c:choose>										
+										
+										</td>
 									</tr>					
 								</c:forEach>
 							</c:when>
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 41ab9880..2ea0c479 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -965,12 +965,12 @@
 										<td>											
 											
 							<c:choose>
-								<c:when test="${list.qestRsltExists}">
-								<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
+								<c:when test="${list.aprvlCd eq 60 and list.qestRsltExists}">
+								<!-- 설문노출대상(확정처리를 받았음(60) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
 
 									<c:choose>
 										
-										<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
+										<c:when test="${list.qestnrId10Cnt gt 0}">
 										<!-- 작성된 설문이 있다 -->
 											<button type="button" class="btn_type04" data-tooltip="sub37_pop20" 
 											onclick="fncInstrCostNewInfo('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
@@ -978,12 +978,13 @@
 											)" title="팝업 열림">설문완료</button>
 										</c:when>
 										
-										<c:when test="${empty list.qestnrId10 and list.aprvlCd eq 20}">
+										<c:when test="${empty list.qestnrId10}">
 										<!-- 대상 설문이 없다 -->
 											대상설문없음									
 										</c:when>		
 										
-										<c:when test="${empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0}">
+										<c:when test="${not empty list.qestnrId10 and list.qestnrId10Cnt eq 0 and list.qustnrTm eq '1'}">
+										<!-- 설문 키값이 있고, 답변이 없고, 설문 오픈 시간이 지났다(1), (0-지나기전)면 설문 등록을 연다 -->										
 										<!-- 작성된 설문이 없다 -->
 											등록된 설문없음						
 										</c:when>
@@ -1000,7 +1001,21 @@
 								</c:otherwise>
 							</c:choose>										
 											
-											<button type="button" class="btn_type04" onclick="fncPrintCert('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert','${list.qustnrTmplatId}','${list.qestnrId10}','')"/>이수증</button>
+											
+
+							<c:choose>
+								<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20'}">
+								<!-- 교육 기간 종료 & 교육신청은 확정(60) & 교육상태는 이슈(20) & 수료증 출력 가능 -->
+									<button type="button" class="btn_type04" 
+									onclick="fncPrintCert('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert','${list.qustnrTmplatId}','${list.qestnrId10}','')"/>출력</button>
+								</c:when>
+								<c:otherwise>
+									-
+								</c:otherwise>
+							</c:choose>
+											
+											
+											
 											
 											
 										</td>	
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 484735b8..e10e3810 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -776,7 +776,7 @@
 						<col style="width: 210px;">			
 						<col style="width: 250px;">
 						
-<%-- 						<col style="width: 140px;">			 --%>
+						<col style="width: 140px;">			
 					</colgroup>
 					<thead>
 					<tr>
@@ -790,7 +790,7 @@
 						<th>교육이수상태변경</th>					
 						<th>취소상태</th>					
 						
-<!-- 						<th>이수증</th>							 -->
+						<th>내용확인</th>							
 					</tr>
 					</thead>					
 					<tbody>
@@ -883,6 +883,61 @@
 												</c:otherwise>
 											</c:choose>			
 										</td>	
+										
+										<td>
+										
+							<c:choose>
+								<c:when test="${list.aprvlCd eq 60 and list.qestRsltExists}">
+								<!-- 설문노출대상(확정처리를 받았음(60) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
+
+									<c:choose>
+										
+										<c:when test="${list.qestnrId10Cnt gt 0}">
+										<!-- 작성된 설문이 있다 -->
+											<button type="button" class="btn_type04" data-tooltip="sub37_pop20" 
+											onclick="fncInstrCostNewInfo('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
+											,'${list.qustnrTmplatId}','${list.qestnrId10}',''
+											)" title="팝업 열림">설문완료</button>
+										</c:when>
+										
+										<c:when test="${empty list.qestnrId10}">
+										<!-- 대상 설문이 없다 -->
+											대상설문없음									
+										</c:when>		
+										
+										<c:when test="${not empty list.qestnrId10 and list.qestnrId10Cnt eq 0 and list.qustnrTm eq '1'}">
+										<!-- 설문 키값이 있고, 답변이 없고, 설문 오픈 시간이 지났다(1), (0-지나기전)면 설문 등록을 연다 -->										
+										<!-- 작성된 설문이 없다 -->
+											등록된 설문없음						
+										</c:when>
+								
+										<c:otherwise>
+											-
+										</c:otherwise>
+									</c:choose>	
+
+								</c:when>
+								<c:otherwise>
+								<!-- 설문노출대상 아님 -->
+									-
+								</c:otherwise>
+							</c:choose>										
+											
+											
+
+							<c:choose>
+								<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20'}">
+								<!-- 교육 기간 종료 & 교육신청은 확정(60) & 교육상태는 이슈(20) & 수료증 출력 가능 -->
+									<button type="button" class="btn_type04" 
+									onclick="fncPrintCert('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert','${list.qustnrTmplatId}','${list.qestnrId10}','')"/>출력</button>
+								</c:when>
+								<c:otherwise>
+									-
+								</c:otherwise>
+							</c:choose>										
+										
+										</td>										
+										
 									</tr>					
 								</c:forEach>
 							</c:when>