tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master_tolag3'

Browse Source
This commit is contained in:
leejunho 2025-11-10 14:29:28 +09:00
commit 2d7e80b59e
8 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java
View File

@ -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);

28
src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
View File

@ -2030,23 +2030,19 @@
</select>
<select id="selectCompleteDocDetail" parameterClass="VEPrcsDetailVO" resultClass="VEPrcsDetailVO">
SELECT
a.prcs_aplct_prd_ord AS prcsAplctPdrOrd
, b.lctr_div_cd AS lctrDivCd
, a.edu_cmplt_crtfc_nmbr AS eduCmpltCrtfcNmbr
, b.title AS title
, b.edu_strt_pnttm AS eduStrtPnttm
, c.chrg_nm AS chrgNm
FROM
vea_aplct_detail_info a
LEFT JOIN ve_prcs_aplct_prd b
ON a.prcs_aplct_prd_ord = b.prcs_aplct_prd_ord
LEFT JOIN ve_edu_aplct c
ON a.prcs_aplct_prd_ord = c.prcs_ord
AND c.aprvl_cd = '60'
SELECT b.prcs_aplct_prd_ord AS prcsAplctPdrOrd,
a.lctr_div_cd AS lctrDivCd,
b.edu_cmplt_crtfc_nmbr AS eduCmpltCrtfcNmbr,
c.title AS title,
c.edu_strt_pnttm AS eduStrtPnttm,
a.chrg_nm AS chrgNm
FROM ve_edu_aplct a
LEFT JOIN vea_aplct_detail_info b ON a.edu_aplct_ord = b.edu_aplct_ord
LEFT JOIN ve_prcs_aplct_prd c ON c.prcs_aplct_prd_ord = b.prcs_aplct_prd_ord
WHERE
a.prcs_aplct_prd_ord = #prcsAplctPrdOrd#
AND a.aplct_state_cd = '20';
b.prcs_aplct_prd_ord = #prcsAplctPrdOrd#
AND b.aplct_state_cd = '20'
AND a.edu_aplct_ord = #eduAplctOrd#
</select>
<select id="selectMainContent" resultClass="VEPrcsDetailVO">

19
src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -483,7 +483,21 @@
// listForm.searchCondition.value = $("#searchCondition").val() ;
vForm.action = "<c:url value='/kccadr/oprtn/cmdTrgt/trgtEduAplctCnfrmExcel.do'/>";
vForm.submit();
}
}
// 이수증
function fncPrintCert(prcsAplctPrdOrd, eduAplctOrd) {
var form = document.popForm;
form.prcsAplctPrdOrd.value = prcsAplctPrdOrd;
form.eduAplctOrd.value = eduAplctOrd;
form.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/popup/printCertPopup.do'/>";
window.open("#", "_printCertPop", "scrollbars = no, top=10px, left=10px, height=1500px, width=1200px");
form.target = "_printCertPop";
form.submit();
}
</script>
</head>
@ -527,6 +541,7 @@
<form id="popForm" name="popForm" method="post">
<input type="hidden" name="pageIndex" value="1"/>
<input type="hidden" name="prcsAplctPrdOrd" value="" />
<input type="hidden" name="eduAplctOrd" value="" />
<input type="hidden" name="pageUnit" value="5" />
</form>
<form:form id="detailForm" name="detailForm" commandName="vEPrcsDetailVO" method="post">
@ -930,7 +945,7 @@
<!-- 교육 기간 종료 & 교육신청은 확정(60) & 교육상태는 이슈(20) & 수료증 출력 가능 -->
<button type="button" class="btn_type04"
onclick="fncPrintCert('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert','${list.qustnrTmplatId}','${list.qestnrId10}','')"/>출력</button>
onclick="fncPrintCert('<c:out value="${info.prcsAplctPrdOrd }" />', '<c:out value="${list.eduAplctOrd}"/>')"/>출력</button>
</c:when>
<c:otherwise>
-

14
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -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 = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/popup/printCertPopup.do'/>";
window.open("#", "_printCertPop", "scrollbars = no, top=10px, left=10px, height=1500px, width=1200px");
form.target = "_printCertPop";
form.submit();
form.submit();
}
// 설문
@ -591,6 +592,7 @@
<form id="popForm" name="popForm" method="post">
<input type="hidden" name="pageIndex" value="1"/>
<input type="hidden" name="prcsAplctPrdOrd" value="" />
<input type="hidden" name="eduAplctOrd" value="" />
<input type="hidden" name="pageUnit" value="5" />
</form>
<form:form id="detailForm" name="detailForm" commandName="vEPrcsDetailVO" method="post">
@ -1008,7 +1010,7 @@
<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20' and list.qestnrId10Cnt gt 0}">
<!-- 교육 기간 종료 & 교육신청은 확정(60) & 교육상태는 이슈(20) & 수료증 출력 가능 -->
<button type="button" class="btn_type04"
onclick="fncPrintCert('<c:out value="${info.prcsAplctPrdOrd }" />')"/>출력</button>
onclick="fncPrintCert('<c:out value="${info.prcsAplctPrdOrd }" />', '<c:out value="${list.eduAplctOrd}"/>')"/>출력</button>
</c:when>
<c:otherwise>
-

4
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/printCertPopup.jsp
View File

@ -81,7 +81,7 @@
$(document).ready(function(){
fncPrintCert_aft('${vEPrcsDetailVO.prcsAplctPrdOrd}');
fncPrintCert_aft('${vEPrcsDetailVO.prcsAplctPrdOrd}', '<c:out value="${vEPrcsDetailVO.eduAplctOrd}"/>');
});
function fncPopClose(){
@ -91,10 +91,12 @@
//이수증 출력
function fncPrintCert_aft(
prcsAplctPrdOrd //aplctOrd
, eduAplctOrd
){
paramObj = {
"prcsAplctPrdOrd" : prcsAplctPrdOrd
, "eduAplctOrd" : eduAplctOrd
};
commonPopLayeropen(

6
src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -487,10 +487,11 @@
}
// 이수증
function fncPrintCert(prcsAplctPrdOrd) {
function fncPrintCert(prcsAplctPrdOrd, eduAplctOrd) {
var form = document.popForm;
form.prcsAplctPrdOrd.value = prcsAplctPrdOrd;
form.eduAplctOrd.value = eduAplctOrd;
form.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/popup/printCertPopup.do'/>";
@ -541,6 +542,7 @@
<form id="popForm" name="popForm" method="post">
<input type="hidden" name="pageIndex" value="1"/>
<input type="hidden" name="prcsAplctPrdOrd" value="" />
<input type="hidden" name="eduAplctOrd" value="" />
<input type="hidden" name="pageUnit" value="5" />
</form>
<form:form id="detailForm" name="detailForm" commandName="vEPrcsDetailVO" method="post">
@ -943,7 +945,7 @@
<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20' and list.qestnrId10Cnt gt 0}">
<!-- 교육 기간 종료 & 교육신청은 확정(60) & 교육상태는 이슈(20) & 수료증 출력 가능 -->
<button type="button" class="btn_type04"
onclick="fncPrintCert('<c:out value="${info.prcsAplctPrdOrd }" />')"/>출력</button>
onclick="fncPrintCert('<c:out value="${info.prcsAplctPrdOrd }" />', '<c:out value="${list.eduAplctOrd}"/>')"/>출력</button>
</c:when>
<c:otherwise>
-

1
src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp
View File

@ -83,6 +83,7 @@ function actionLogin() {
<option value="최길동:01077778888:W:19240501:EwekrDfuErjWrj/DSjfsduerlkrkjweR+DJfisdfioueklrjiJeudsdWErQWERasdvDASgfeRTdsioufiuERwe==">최길동:01077778888:W:19240501</option>
<option value="채길동:01099998888:M:20040101:FwekrDfuErjWrj/DSjfsduerlkrkjweR+DJfisdfioueklrjiJeudsdWErQWERasdvDASgfeRTdsioufiuERwe==">채길동:01099998888:M:20040101</option>
<option value="박길동:01055551111:W:19991124:GwekrDfuErjWrj/DSjfsduerlkrkjweR+DJfisdfioueklrjiJeudsdWErQWERasdvDASgfeRTdsioufiuERwe==">박길동:01055551111:W:19991124</option>
<option value="이준호:01030266269:M:19890202:HwekrDfuErjWrj/DSjfsduerlkrkjweR+DJfisdfioueklrjiJeudsdWErQWERasdvDASgfeRTdsioufiuERwe==">이준호:01030266269:M:19890202</option>
</select>
<br></br>
<div class="login_form">

4
src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp
View File

@ -152,10 +152,12 @@
//이수증 출력
function fncPrintCert(
prcsAplctPrdOrd //aplctOrd
, eduAplctOrd
){
paramObj = {
"prcsAplctPrdOrd" : prcsAplctPrdOrd
, "eduAplctOrd" : eduAplctOrd
};
commonPopLayeropen(
@ -299,7 +301,7 @@
<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20' and list.qestnrId10Cnt gt 0}">
<!-- 교육 기간 종료 & 교육신청은 확정(60) & 교육상태는 이슈(20) & 설문이 완료된 경우만 수료증 출력 가능 -->
<button type="button" class="btn small mint line sur_bt" data-info="${list.eduAplctOrd}" data-tooltip="sub36_pop02"
onclick="fncPrintCert('${list.prcsAplctPrdOrd}')" title="출력">출력</button>
onclick="fncPrintCert('${list.prcsAplctPrdOrd}', '<c:out value="${list.eduAplctOrd}"/>')" title="출력">출력</button>
</c:when>
<c:when test="${list.dateChk eq 1 and not list.qestRsltExists}">
교육완료