diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java index 74843b23..f0302b67 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java @@ -463,7 +463,8 @@ public class ScholInfoController { vEPrcsDetailVO = vEPrcsAplctPrdService.selectCompleteDocDetail(vEPrcsDetailVO); vEPrcsDetailVO.setTrgtNm(egovCryptoUtil.decrypt(vEPrcsDetailVO.getTrgtNm())); - + vEPrcsDetailVO.setChrgNm(egovCryptoUtil.decrypt(vEPrcsDetailVO.getChrgNm())); + //기본정보 model.addAttribute("completeDocDetail", vEPrcsDetailVO); diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml index 9694a889..a33a6238 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml @@ -2040,23 +2040,19 @@ + @@ -946,7 +961,7 @@ + onclick="fncPrintCert('', '')"/>출력 - 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 8eaf6131..a11537dd 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -486,16 +486,17 @@ } // 이수증 - function fncPrintCert(prcsAplctPrdOrd) { + function fncPrintCert(prcsAplctPrdOrd, eduAplctOrd) { var form = document.popForm; - + form.prcsAplctPrdOrd.value = prcsAplctPrdOrd; - + form.eduAplctOrd.value = eduAplctOrd; + form.action = ""; - + window.open("#", "_printCertPop", "scrollbars = no, top=10px, left=10px, height=1500px, width=1200px"); form.target = "_printCertPop"; - form.submit(); + form.submit(); } // 설문 @@ -591,6 +592,7 @@
+
@@ -1008,7 +1010,7 @@ + onclick="fncPrintCert('', '')"/>출력 - diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/printCertPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/printCertPopup.jsp index 71a36b0c..df317acd 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/printCertPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/printCertPopup.jsp @@ -81,7 +81,7 @@ $(document).ready(function(){ - fncPrintCert_aft('${vEPrcsDetailVO.prcsAplctPrdOrd}'); + fncPrintCert_aft('${vEPrcsDetailVO.prcsAplctPrdOrd}', ''); }); function fncPopClose(){ @@ -91,10 +91,12 @@ //이수증 출력 function fncPrintCert_aft( prcsAplctPrdOrd //aplctOrd + , eduAplctOrd ){ paramObj = { "prcsAplctPrdOrd" : prcsAplctPrdOrd + , "eduAplctOrd" : eduAplctOrd }; commonPopLayeropen( 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 3c9c9c64..df0e5a8a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -484,7 +484,21 @@ // listForm.searchCondition.value = $("#searchCondition").val() ; vForm.action = ""; vForm.submit(); - } + } + + // 이수증 + function fncPrintCert(prcsAplctPrdOrd, eduAplctOrd) { + var form = document.popForm; + + form.prcsAplctPrdOrd.value = prcsAplctPrdOrd; + form.eduAplctOrd.value = eduAplctOrd; + + form.action = ""; + + window.open("#", "_printCertPop", "scrollbars = no, top=10px, left=10px, height=1500px, width=1200px"); + form.target = "_printCertPop"; + form.submit(); + } @@ -528,6 +542,7 @@
+
@@ -929,8 +944,10 @@ - + + + - diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp index 7df3e8ca..6814e1c0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp @@ -83,6 +83,7 @@ function actionLogin() { +