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 @@
', '