From f0ccf5e86bafb18efb198139ecfbd190bd606ae9 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 28 Dec 2023 16:42:53 +0900
Subject: [PATCH] =?UTF-8?q?2023-12-28=2016:42=20=EA=B8=B0=EB=B0=98?=
 =?UTF-8?q?=EA=B0=95=ED=99=94=20=EC=84=A4=EB=AC=B8,=20=EC=9D=B4=EC=88=98?=
 =?UTF-8?q?=EC=A6=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stngInfo/service/VEACmpltCrtfcVO.java     |  8 ++
 .../aplct/comweb/CrownixAjaxController.java   | 13 ++-
 .../ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml   |  2 +
 .../cndtnEduPrcsAplctCfnMngDetail.jsp         | 97 +++++++++----------
 4 files changed, 69 insertions(+), 51 deletions(-)

diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcVO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcVO.java
index 6e06998a..7e99b55a 100644
--- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcVO.java
+++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEACmpltCrtfcVO.java
@@ -32,6 +32,8 @@ public class VEACmpltCrtfcVO extends ComDefaultVO implements Serializable {
 	private String desc3;				//과정명
 	private String desc4;				//과정명
 	
+	private String lctrDivCd;			//과정구분 코드	50-실무, 60-기소
+	
 
 	private static final long serialVersionUID = 1L;
 
@@ -132,5 +134,11 @@ public class VEACmpltCrtfcVO extends ComDefaultVO implements Serializable {
 	public void setDesc4(String desc4) {
 		this.desc4 = desc4;
 	}
+	public String getLctrDivCd() {
+		return lctrDivCd;
+	}
+	public void setLctrDivCd(String lctrDivCd) {
+		this.lctrDivCd = lctrDivCd;
+	}
 	
 }
diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
index 6621a45c..9f8bbed2 100644
--- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
+++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java
@@ -173,6 +173,10 @@ public class CrownixAjaxController {
 				
 				vEACmpltCrtfcVO	=	vEACmpltCrtfcMixService.selectDetail_CC_1(vEACmpltCrtfcVO);
 				
+				String s_lctrDivCd	=	vEACmpltCrtfcVO.getLctrDivCd();
+				
+				
+				//복호화
 				vEACmpltCrtfcVO.setMberNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getMberNm()));
 				vEACmpltCrtfcVO.setInstrNm(egovCryptoUtil.decrypt(vEACmpltCrtfcVO.getInstrNm()));
 				
@@ -191,7 +195,8 @@ public class CrownixAjaxController {
 				*/			
 				
 				//modelAndView.addObject("data_t", "교육연수이수증");
-				modelAndView.addObject("data_t", "<"+vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()+">");
+				if ("50".equals(s_lctrDivCd))	modelAndView.addObject("data_t", "<실무역량-"+vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()+">");
+				if ("60".equals(s_lctrDivCd))	modelAndView.addObject("data_t", "<기소유예-"+vEACmpltCrtfcVO.getEduCmpltCrtfcNmbr()+">");
 				
 				modelAndView.addObject("data_1", vEACmpltCrtfcVO.getPrcsNm());
 
@@ -209,7 +214,11 @@ public class CrownixAjaxController {
 				
 				
 				modelAndView.addObject("data_2", vEACmpltCrtfcVO.getMberNm()+"("+s_birthDay+")");
-				modelAndView.addObject("data_3", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm());
+				
+				
+				if ("50".equals(s_lctrDivCd))	modelAndView.addObject("data_3", vEACmpltCrtfcVO.getEduStrtPnttm()+"~"+vEACmpltCrtfcVO.getEduDdlnPnttm());
+				if ("60".equals(s_lctrDivCd))	modelAndView.addObject("data_3", vEACmpltCrtfcVO.getEduStrtPnttm());
+				
 				
 				//강사명1,2,3
 				System.out.println("vEACmpltCrtfcVO.getDesc1()");
diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml
index 84cd8f53..b711b923 100644
--- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEACmpltCrtfcMix_SQL_Tibero.xml
@@ -44,6 +44,8 @@
                , vi.DESC_3					AS	desc3
                , vi.DESC_4   				AS	desc4
                , vid.INSTR_NM 				AS	instrNm
+               
+               , vpap.lctr_Div_Cd			AS	lctrDivCd	
 			
 		FROM 
 				 ve_prcs_aplct_prd vpap
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 391360c0..0190a5f1 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -593,61 +593,60 @@
 											<button type="button" class="btn_type05" onclick="fn_statusChg('10', '<c:out value="${list.eduAplctOrd }" />', '<c:out value="${list.sspnIdtmtTrgtOrd }"/>')">미이수</button>
 										</td>
 										<td>
+<%-- 											<c:choose> --%>
+<%-- 												<c:when test="${list.qestRsltExists }"> --%>
+<%-- 													<button type="button" class="btn_type04" onclick="fncInstrCostInfo('${list.eduAplctOrd }', '${list.userId }');">설문결과</button> --%>
+<%-- 												</c:when> --%>
+<%-- 												<c:otherwise> --%>
+<!-- 													미입력  -->
+<%-- 												</c:otherwise> --%>
+<%-- 											</c:choose> --%>
+
 											<c:choose>
-												<c:when test="${list.qestRsltExists }">
-<%-- 													<button type="button" class="btn_type04" onclick="fncInstrCostInfo('<c:out value="${list.qestnrId }"/>');">설문결과</button> --%>
-													<button type="button" class="btn_type04" onclick="fncInstrCostInfo('${list.eduAplctOrd }', '${list.userId }');">설문결과</button>
+												<c:when test="${list.aprvlCd eq 20 and list.qestRsltExists and list.aplctStateCd ne 10}">
+												<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
+				
+													<c:choose>
+														
+														<c:when test="${list.aplctStateCd eq 20 and 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 and list.aprvlCd eq 20}">
+														<!-- 대상 설문이 없다 -->
+															대상설문없음									
+														</c:when>		
+														
+														<c:when test="${empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0}">
+														<!-- 작성된 설문이 없다 -->
+															등록된 설문없음						
+														</c:when>
+												
+														<c:otherwise>
+															-
+														</c:otherwise>
+													</c:choose>	
+				
 												</c:when>
 												<c:otherwise>
-													미입력 
+												<!-- 설문노출대상 아님 -->
+													-
 												</c:otherwise>
-											</c:choose>
-
-							<c:choose>
-								<c:when test="${list.aprvlCd eq 20 and list.qestRsltExists and list.aplctStateCd ne 10}">
-								<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
-
-									<c:choose>
-										
-										<c:when test="${list.aplctStateCd eq 20 and 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 and list.aprvlCd eq 20}">
-										<!-- 대상 설문이 없다 -->
-											대상설문없음									
-										</c:when>		
-										
-										<c:when test="${empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0}">
-										<!-- 작성된 설문이 없다 -->
-											등록된 설문없음						
-										</c:when>
-								
-										<c:otherwise>
-											-
-										</c:otherwise>
-									</c:choose>	
-
-								</c:when>
-								<c:otherwise>
-								<!-- 설문노출대상 아님 -->
-									-
-								</c:otherwise>
-							</c:choose>											
+											</c:choose>											
 										</td>
 										<td>
-											<c:choose>
-												<c:when test="${list.qestRsltExists }">
-													<button type="button" title="이수증" class="btn_type04" onclick="fncCmpltCrtfc('<c:out value="${info.prcsAplctPrdOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">이수증</button>
-												</c:when>
-												<c:otherwise>
-												-
-												</c:otherwise>
-											</c:choose>
+<%-- 											<c:choose> --%>
+<%-- 												<c:when test="${list.qestRsltExists }"> --%>
+<%-- 													<button type="button" title="이수증" class="btn_type04" onclick="fncCmpltCrtfc('<c:out value="${info.prcsAplctPrdOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">이수증</button> --%>
+<%-- 												</c:when> --%>
+<%-- 												<c:otherwise> --%>
+<!-- 												- -->
+<%-- 												</c:otherwise> --%>
+<%-- 											</c:choose> --%>
 											
 											<c:choose>
 												<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">