From 2df0492298c72ec6540e9bdb6d3844340fa9f9d2 Mon Sep 17 00:00:00 2001 From: ijunho Date: Thu, 30 Oct 2025 12:20:14 +0900 Subject: [PATCH 1/7] Merge branch 'fix/restore-20251029-143323' into master_tolag3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 신청 수정 중 --- .../service/impl/CmdTrgtServiceImpl.java | 3 + .../service/impl/PreventServiceImpl.java | 3 + .../service/impl/SspnIdtmtServiceImpl.java | 3 + .../aplct/cmdTrgt/popup/eduAplctPopList.jsp | 256 +++--------------- .../aplct/prevent/popup/eduAplctPopList.jsp | 254 +++-------------- .../aplct/sspnIdtmt/popup/eduAplctPopList.jsp | 253 +++-------------- 6 files changed, 133 insertions(+), 639 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java b/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java index f5416b94..e35affe5 100644 --- a/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java @@ -247,6 +247,9 @@ public class CmdTrgtServiceImpl implements CmdTrgtService { vEInstrMixService.insertInstrEmailCrtfd(vEInstrDetailVO); } + + //인증번호 임시노출 실서버 운영 시 삭제_이준호_251030 + modelAndView.addObject("crtfdNumber", code); } diff --git a/src/main/java/kcc/ve/aplct/prevent/service/impl/PreventServiceImpl.java b/src/main/java/kcc/ve/aplct/prevent/service/impl/PreventServiceImpl.java index 238d4016..c48aad02 100644 --- a/src/main/java/kcc/ve/aplct/prevent/service/impl/PreventServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/prevent/service/impl/PreventServiceImpl.java @@ -247,6 +247,9 @@ public class PreventServiceImpl implements PreventService { vEInstrMixService.insertInstrEmailCrtfd(vEInstrDetailVO); } + + //인증번호 임시노출 실서버 운영 시 삭제_이준호_251030 + modelAndView.addObject("crtfdNumber", code); } diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java index 59004b46..1d5b1f6f 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java @@ -304,6 +304,9 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { vEInstrMixService.insertInstrEmailCrtfd(vEInstrDetailVO); } + + //인증번호 임시노출 실서버 운영 시 삭제_이준호_251030 + modelAndView.addObject("crtfdNumber", code); } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPopList.jsp index 769b2dbd..a1c5a73d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPopList.jsp @@ -72,10 +72,19 @@ //제출 function fn_new_confirm(p_prcsAplctPrdOrd){ var form = document.confirmForm; - console.log('$("#dBirth").val() : ' , $('#dBirth').val()); - var dBirth = $('#dBirth').val().replace(/\./g, ''); + var dBirth = $('#birth_input').val(); + if(dBirth.substring(0,2) >= 50){ + dBirth = "19" + dBirth; + }else{ + dBirth = "20" + dBirth; + } var trgtNm = $('#trgtNm').val(); - var sex = $('input[name="sex"]:checked').val(); + var sex = $('#jender_input').val(); + if(sex % 2 == 1){ + sex = "M"; + }else{ + sex = "F" + } var clphone = $('#clphone').val(); $('#regForm input[name="prcsAplctPrdOrd"]').val(p_prcsAplctPrdOrd); @@ -127,11 +136,11 @@ $("#chkBtn").hide(); //기존정보 변경 막기 $("#trgtNm").prop('readonly', true); - $("#date").prop('readonly', true); + $("#birth_input").prop('readonly', true); + $("#jender_input").prop('readonly', true); $("#clphone").prop('readonly', true); $(".duet-date__toggle").remove(); - $("#sexM").attr("onclick", "return(false);"); - $("#sexF").attr("onclick", "return(false);"); + alert(returnData.crtfdNumber); }else{ //본인인증 후 @@ -205,7 +214,12 @@ //선택 function fn_new_select(p_cmdTrgtInfoOrd){ - var dBirth = $('#dBirth').val().replace(/\./g, ''); + var dBirth = $('#birth_input').val(); + if(dBirth.substring(0,2) >= 50){ + dBirth = "19" + dBirth; + }else{ + dBirth = "20" + dBirth; + } var trgtNm = $('#trgtNm').val(); var clphone = $('#clphone').val(); @@ -284,7 +298,7 @@ $(document).ready(function(){ } //생년월일 - if ('${fn:substring(loginVO.membBirth, 0 ,4)}'>='0'){ + /* if ('${fn:substring(loginVO.membBirth, 0 ,4)}'>='0'){ $('#year').val('${fn:substring(loginVO.membBirth, 0 ,4)}'); } @@ -294,13 +308,11 @@ $(document).ready(function(){ if ('${fn:substring(loginVO.membBirth, 6 ,8)}'>='0'){ $('#day').val('${fn:substring(loginVO.membBirth, 6 ,8)}'); - } + } */ - var year = $("#year").val(); - var month = $("#month").val(); - var day = $("#day").val(); - $("#dBirth").val(year+"."+month+"."+day); - + var birthStr = "${loginVO.membBirth}"; + console.log(birthStr); + $('#birth_input').val(birthStr.substring(2, 8)); //휴대폰번호 if ('${loginVO.membCelnum}'!=''){ @@ -309,12 +321,18 @@ $(document).ready(function(){ //성별sexMsexM if ('${loginVO.sexCode}'=='M'){ - $('input[id="sexM"]').attr("checked", true); - + if(${fn:substring(loginVO.membBirth, 0 ,4) >= 2000}){ + $('#jender_input').val('3'); + }else{ + $('#jender_input').val('1'); + } }else if ('${loginVO.sexCode}'=='F'){ - $('input[id="sexF"]').attr("checked", true); - - } + if(${fn:substring(loginVO.membBirth, 0 ,4) >= 2000}){ + $('#jender_input').val('4'); + }else{ + $('#jender_input').val('2'); + } + } }) @@ -357,195 +375,14 @@ $(document).ready(function(){ - 생년월일 8자리 (ex.1988.01.01) + 생년월일/성별 -
- -  년   -  월   -  일   - - - +
+ + + - + ●●●●●●
- <%-- --%> @@ -561,13 +398,6 @@ $(document).ready(function(){ - - 성별 - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduAplctPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduAplctPopList.jsp index fe9317c0..d74d18d6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduAplctPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduAplctPopList.jsp @@ -71,11 +71,22 @@ //제출 function fn_new_confirm(p_prcsAplctPrdOrd){ + var form = document.confirmForm; var form = document.confirmForm; console.log('$("#dBirth").val() : ' , $('#dBirth').val()); - var dBirth = $('#dBirth').val().replace(/\./g, ''); + var dBirth = $('#birth_input').val(); + if(dBirth.substring(0,2) >= 50){ + dBirth = "19" + dBirth; + }else{ + dBirth = "20" + dBirth; + } var trgtNm = $('#trgtNm').val(); - var sex = $('input[name="sex"]:checked').val(); + var sex = $('#jender_input').val(); + if(sex % 2 == 1){ + sex = "M"; + }else{ + sex = "F" + } var clphone = $('#clphone').val(); $('#regForm input[name="prcsAplctPrdOrd"]').val(p_prcsAplctPrdOrd); @@ -127,11 +138,11 @@ $("#chkBtn").hide(); //기존정보 변경 막기 $("#trgtNm").prop('readonly', true); - $("#date").prop('readonly', true); + $("#birth_input").prop('readonly', true); + $("#jender_input").prop('readonly', true); $("#clphone").prop('readonly', true); $(".duet-date__toggle").remove(); - $("#sexM").attr("onclick", "return(false);"); - $("#sexF").attr("onclick", "return(false);"); + alert(returnData.crtfdNumber); }else{ //본인인증 후 @@ -205,7 +216,12 @@ //선택 function fn_new_select(p_cmdTrgtInfoOrd){ - var dBirth = $('#dBirth').val().replace(/\./g, ''); + var dBirth = $('#birth_input').val(); + if(dBirth.substring(0,2) >= 50){ + dBirth = "19" + dBirth; + }else{ + dBirth = "20" + dBirth; + } var trgtNm = $('#trgtNm').val(); var clphone = $('#clphone').val(); @@ -284,7 +300,7 @@ $(document).ready(function(){ } //생년월일 - if ('${fn:substring(loginVO.membBirth, 0 ,4)}'>='0'){ + /* if ('${fn:substring(loginVO.membBirth, 0 ,4)}'>='0'){ $('#year').val('${fn:substring(loginVO.membBirth, 0 ,4)}'); } @@ -294,13 +310,11 @@ $(document).ready(function(){ if ('${fn:substring(loginVO.membBirth, 6 ,8)}'>='0'){ $('#day').val('${fn:substring(loginVO.membBirth, 6 ,8)}'); - } + } */ - var year = $("#year").val(); - var month = $("#month").val(); - var day = $("#day").val(); - $("#dBirth").val(year+"."+month+"."+day); - + var birthStr = "${loginVO.membBirth}"; + console.log(birthStr); + $('#birth_input').val(birthStr.substring(2, 8)); //휴대폰번호 if ('${loginVO.membCelnum}'!=''){ @@ -309,11 +323,17 @@ $(document).ready(function(){ //성별sexMsexM if ('${loginVO.sexCode}'=='M'){ - $('input[id="sexM"]').attr("checked", true); - + if(${fn:substring(loginVO.membBirth, 0 ,4) >= 2000}){ + $('#jender_input').val('3'); + }else{ + $('#jender_input').val('1'); + } }else if ('${loginVO.sexCode}'=='F'){ - $('input[id="sexF"]').attr("checked", true); - + if(${fn:substring(loginVO.membBirth, 0 ,4) >= 2000}){ + $('#jender_input').val('4'); + }else{ + $('#jender_input').val('2'); + } } }) @@ -357,195 +377,14 @@ $(document).ready(function(){ - 생년월일 8자리 (ex.1988.01.01) + 생년월일/성별 -
- -  년   -  월   -  일   - - - +
+ + + - + ●●●●●●
- <%-- --%> @@ -561,13 +400,6 @@ $(document).ready(function(){ - - 성별 - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp index 34e835ae..93a80f4c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp @@ -72,10 +72,19 @@ //제출 function fn_new_confirm(p_prcsAplctPrdOrd){ var form = document.confirmForm; - console.log('$("#dBirth").val() : ' , $('#dBirth').val()); - var dBirth = $('#dBirth').val().replace(/\./g, ''); + var dBirth = $('#birth_input').val(); + if(dBirth.substring(0,2) >= 50){ + dBirth = "19" + dBirth; + }else{ + dBirth = "20" + dBirth; + } var trgtNm = $('#trgtNm').val(); - var sex = $('input[name="sex"]:checked').val() || ''; + var sex = $('#jender_input').val(); + if(sex % 2 == 1){ + sex = "M"; + }else{ + sex = "F" + } var clphone = $('#clphone').val(); $('#regForm input[name="prcsAplctPrdOrd"]').val(p_prcsAplctPrdOrd); @@ -127,12 +136,11 @@ $("#chkBtn").hide(); //기존정보 변경 막기 $("#trgtNm").prop('readonly', true); - $("#date").prop('readonly', true); + $("#birth_input").prop('readonly', true); + $("#jender_input").prop('readonly', true); $("#clphone").prop('readonly', true); $(".duet-date__toggle").remove(); - $("#sexM").attr("onclick", "return(false);"); - $("#sexF").attr("onclick", "return(false);"); - + alert(returnData.crtfdNumber); }else{ //본인인증 후 @@ -205,7 +213,12 @@ //선택 function fn_new_select(p_sspnIdtmtTrgtOrd){ - var dBirth = $('#dBirth').val().replace(/\./g, ''); + var dBirth = $('#birth_input').val(); + if(dBirth.substring(0,2) >= 50){ + dBirth = "19" + dBirth; + }else{ + dBirth = "20" + dBirth; + } var trgtNm = $('#trgtNm').val(); var clphone = $('#clphone').val(); @@ -284,7 +297,7 @@ $(document).ready(function(){ } //생년월일 - if ('${fn:substring(loginVO.membBirth, 0 ,4)}'>='0'){ + /* if ('${fn:substring(loginVO.membBirth, 0 ,4)}'>='0'){ $('#year').val('${fn:substring(loginVO.membBirth, 0 ,4)}'); } @@ -294,13 +307,11 @@ $(document).ready(function(){ if ('${fn:substring(loginVO.membBirth, 6 ,8)}'>='0'){ $('#day').val('${fn:substring(loginVO.membBirth, 6 ,8)}'); - } - - var year = $("#year").val(); - var month = $("#month").val(); - var day = $("#day").val(); - $("#dBirth").val(year+"."+month+"."+day); + } */ + var birthStr = "${loginVO.membBirth}"; + console.log(birthStr); + $('#birth_input').val(birthStr.substring(2, 8)); //휴대폰번호 if ('${loginVO.membCelnum}'!=''){ @@ -309,11 +320,17 @@ $(document).ready(function(){ //성별sexMsexM if ('${loginVO.sexCode}'=='M'){ - $('input[id="sexM"]').attr("checked", true); - + if(${fn:substring(loginVO.membBirth, 0 ,4) >= 2000}){ + $('#jender_input').val('3'); + }else{ + $('#jender_input').val('1'); + } }else if ('${loginVO.sexCode}'=='F'){ - $('input[id="sexF"]').attr("checked", true); - + if(${fn:substring(loginVO.membBirth, 0 ,4) >= 2000}){ + $('#jender_input').val('4'); + }else{ + $('#jender_input').val('2'); + } } }) @@ -361,197 +378,10 @@ $(document).ready(function(){
- - - + + - ●●●●●●
- <%--
- -  년   -  월   -  일   - - - -
--%> - <%-- --%> @@ -567,13 +397,6 @@ $(document).ready(function(){ - - 성별 - - - - - From 3b4fde1ffbf957c424bf8a3a4389c77b0cb51f37 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Thu, 30 Oct 2025 12:34:00 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B8=B0?= =?UTF-8?q?=EC=86=8C,=EC=8B=9C=EC=A0=95,=EC=98=88=EB=B0=A9=20=EA=B5=90?= =?UTF-8?q?=EC=9C=A1=20=EC=B2=98=EB=A6=AC=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/aplct/cmdTrgt/web/CmdTrgtController.java | 16 +++++++++++++--- .../ve/aplct/prevent/web/PreventController.java | 15 +++++++++++++-- .../cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp | 2 +- .../prevent/cndtnEduPrcsAplctCfnMngDetail.jsp | 2 +- .../WEB-INF/jsp/web/my/myPageDashBoard.jsp | 2 +- .../web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp | 2 +- .../web/ve/aplct/prevent/popup/eduCancelPop.jsp | 2 +- 7 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java b/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java index 63eba404..943184a5 100644 --- a/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java +++ b/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java @@ -817,7 +817,8 @@ public class CmdTrgtController { */ @RequestMapping("/web/ve/aplct/cmdTrgt/popup/eduCancelPopupAjax.do") public ModelAndView filePopupAjax( - @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO + @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO, + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model //, RedirectAttributes redirectAttributes , HttpServletRequest request @@ -879,7 +880,7 @@ public class CmdTrgtController { //step2.파일 처리==================================== try { - + /* System.out.println("vEEduRprtVO.getAprvlCn()"); System.out.println(vEEduRprtVO.getEduAplctOrd()); System.out.println(vEEduRprtVO.getAprvlCn()); @@ -895,7 +896,16 @@ public class CmdTrgtController { //취소요청 정보 저장 vEEduAplctService.update(vEEduAplctVO); - + */ + /* + 251023 + ve_edu_aplct는 확정 상태 유지. + vea_aplct_detail_info에서 취소 관련 처리 + */ + vEEduAplctVO.setAplctStateCd(VeConstants.EDU_CD_CANCLE_REQ); //취소요청 코드 35 + vEEduAplctVO.setCnclAtchFileId(s_atchFileId); + vEEduAplctVO.setCnclCn(vEEduAplctVO.getAprvlCn()); //취소사유 - 기존에는 aprvlCn 사용 + vEEduMIXService.updateCnclStatus(vEEduAplctVO); }catch(Exception ex) { System.out.println("Exception vEEduRsltRprtService.insert"); diff --git a/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java b/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java index bf49a0b2..d3120228 100644 --- a/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java +++ b/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java @@ -817,7 +817,8 @@ public class PreventController { */ @RequestMapping("/web/ve/aplct/prevent/popup/eduCancelPopupAjax.do") public ModelAndView filePopupAjax( - @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO + @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO, + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model //, RedirectAttributes redirectAttributes , HttpServletRequest request @@ -879,7 +880,7 @@ public class PreventController { //step2.파일 처리==================================== try { - + /* System.out.println("vEEduRprtVO.getAprvlCn()"); System.out.println(vEEduRprtVO.getEduAplctOrd()); System.out.println(vEEduRprtVO.getAprvlCn()); @@ -895,7 +896,17 @@ public class PreventController { //취소요청 정보 저장 vEEduAplctService.update(vEEduAplctVO); + */ + /* + 251023 + ve_edu_aplct는 확정 상태 유지. + vea_aplct_detail_info에서 취소 관련 처리 + */ + vEEduAplctVO.setAplctStateCd(VeConstants.EDU_CD_CANCLE_REQ); //취소요청 코드 35 + vEEduAplctVO.setCnclAtchFileId(s_atchFileId); + vEEduAplctVO.setCnclCn(vEEduAplctVO.getAprvlCn()); //취소사유 - 기존에는 aprvlCn 사용 + vEEduMIXService.updateCnclStatus(vEEduAplctVO); }catch(Exception ex) { System.out.println("Exception vEEduRsltRprtService.insert"); 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 9622f003..5ca38e43 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -826,7 +826,7 @@ - + <%-- --%> <%-- --%> <%-- --%> 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 e403c254..fd0d892f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -826,7 +826,7 @@ - + <%-- --%> <%-- --%> <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp index 4a0da743..f39a0925 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp @@ -271,7 +271,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp index 290da886..eeb7b037 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp @@ -118,7 +118,7 @@ $.ajax({ type: "POST", enctype: 'multipart/form-data', - url: "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/popup/eduCancelPopupAjax.do", + url: "${pageContext.request.contextPath}/web/ve/aplct/cmdTrgt/popup/eduCancelPopupAjax.do", data: data, dataType:'json', async: false, diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp index 290da886..07856b47 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp @@ -118,7 +118,7 @@ $.ajax({ type: "POST", enctype: 'multipart/form-data', - url: "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/popup/eduCancelPopupAjax.do", + url: "${pageContext.request.contextPath}/web/ve/aplct/prevent/popup/eduCancelPopupAjax.do", data: data, dataType:'json', async: false, From 8a51555c1ddd6ddc8e6fd4c17e346080dd65b81d Mon Sep 17 00:00:00 2001 From: subsub Date: Thu, 30 Oct 2025 14:59:54 +0900 Subject: [PATCH 3/7] =?UTF-8?q?(=EC=82=AC=EC=9A=A9=EC=9E=90)=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=EC=9D=B8=20=EC=A0=95=EB=B3=B4=20=ED=8C=9D=EC=97=85=20?= =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=EB=8F=99=EC=9D=98=20?= =?UTF-8?q?=EC=98=81=EC=97=AD=20=EC=88=98=EC=A0=95,=20=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EB=8C=80=EC=83=81=EC=9E=90=ED=99=95=EC=9D=B8=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20=EB=8B=AB=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EA=B5=90=EC=9C=A1=EC=8B=A0=EC=B2=AD=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=8B=A0=EC=B2=AD=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EA=B8=B0=EB=8A=A5=20=EC=82=AD=EC=A0=9C,?= =?UTF-8?q?=20=ED=91=B8=ED=84=B0=20=EC=83=88=EC=B0=BD=EC=97=B4=EB=A6=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/com/webCommonFooter.jsp | 18 +++++++------- .../web/ve/aplct/sspnIdtmt/eduAplctList.jsp | 4 ++-- .../ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp | 24 +++++++++---------- .../aplct/sspnIdtmt/popup/eduAplctPopList.jsp | 5 ++-- .../visitEdu/usr/publish/css/content.css | 3 ++- .../webapp/visitEdu/usr/publish/css/popup.css | 2 +- .../usr/publish/script/visitEduCom.js | 17 +++++++++++++ 7 files changed, 46 insertions(+), 27 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp index 60ce67ce..30c96469 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp @@ -45,17 +45,17 @@ function footerSiteLinkPageGo (){
    -
    • -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
    • +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp index b4ef8ff8..d53597a6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp @@ -769,8 +769,8 @@ $(document).ready(function(){ onclick="fncAplctPopup('','','','10','select' ,'','','' )" title="팝업 열림">신청 --%> -
-
개인정보 처리 동의서
-
- 한국지식재산보호원에서는 귀하의 개인정보를 중요시하며, 개인정보보호법 제15조, 제17조, 제22조, 제23조 및 제24조에 따라 아래와 같이 개인정보 처리에 관하여 동의를 얻고자 합니다.
-										
- <개인정보 수집 및 이용에 대한 동의 >
+					

+						

+							
+개인정보 처리 동의서
+						
+한국지식재산보호원에서는 귀하의 개인정보를 중요시하며, 개인정보보호법 제15조, 제17조, 제22조, 제23조 및 제24조에 따라 아래와 같이 개인정보 처리에 관하여 동의를 얻고자 합니다.
+									
+	<개인정보 수집 및 이용에 대한 동의 >
 	ο 개인정보의 수집 이용 목적 : 교육 대상자 및 이수자 관리
 	ο 수집하는 개인정보 항목 : 성명, 생년월일, 휴대전화, 이메일
 	ο 개인정보의 보유 및 이용기간 : 사업 종료시까지
 	ο 동의를 거부할 권리가 있다는 사실 및 동의 거부에 따른 불이익이 있는 경우에는 그 불이익의 내용 :
 	  귀하의 개인정보 제공 및 동의를 거부할 권리가 있으며, 위 항목 동의 거부시 수강신청이 불가할 수 있음
-

-					

-						

+
-
- -
-
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp index 93a80f4c..2d91c746 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp @@ -153,7 +153,8 @@ { //sspnIdtmtTrgtOrd = returnData.id; //fncEduReg(trgtNm, dBirth, returnData.id); - $('#target_confirm_popup-close').click(); + /* $('#target_confirm_popup-close').click(); */ + commonPopLayerClose("Y","user_check_popup"); fn_eduRegPopup(trgtNm, dBirth, clphone, returnData.id); }else if(returnData.next == "N"){ //동일 대상자 중에서 선택할수 있도록 처리해야 한다. @@ -351,7 +352,7 @@ $(document).ready(function(){ -
+

교육대상자 확인

diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index 6fe1f1df..a3134c86 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -688,12 +688,13 @@ duet-date-picker *:focus{outline: auto !important;} .agree_wrap .agree_text {width: 100%;height: 245px; padding: 20px; border: 1px solid #d5d5d5; box-sizing: border-box; color: #666; line-height: 1.5; font-family: 'Noto Sans KR', sans-serif; font-weight: 300; font-size: 16px; overflow-y: scroll;} .agree_wrap .agree_text::-webkit-scrollbar { width: 4px;} .agree_wrap .agree_text::-webkit-scrollbar-thumb {background-color: #d5d5d5;border-radius: 5px;} -.agree_wrap .agree_text pre {line-height: 1.5;} +.agree_wrap .agree_text pre {font-size: 16px; line-height: 1.5;white-space: break-spaces;} .agree_wrap table {width: 100%; margin: 15px 0; font-size: 16px; } .agree_wrap table thead th {background-color: #f5f5f5; height: 40px; border-top: 2px solid #000; border-bottom: 1px solid #d5d5d5; text-align: center; vertical-align: middle; color: #555; font-weight: 400;} .agree_wrap table tbody th {color: #555; font-weight: 400; text-align: left;} .agree_wrap table tbody th, .agree_wrap table tbody td {height: 50px; padding: 0 20px; border-bottom: 1px solid #d5d5d5; vertical-align: middle; letter-spacing: -1px;} .agree_wrap .agree_chx {background-color: #f5f5f5; border-radius: 5px; padding: 16px 20px; margin-top: 8px; margin-bottom: 40px; box-sizing: border-box;} +.agree_wrap .agree_chx label{margin:0 0 0 6px;} /* file table */ .file_wrap{width: 100%; margin-top: 10px; border: 1px solid #d5d5d5; border-radius: 5px; overflow: hidden;} diff --git a/src/main/webapp/visitEdu/usr/publish/css/popup.css b/src/main/webapp/visitEdu/usr/publish/css/popup.css index c3390b9b..05f55cef 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/popup.css +++ b/src/main/webapp/visitEdu/usr/publish/css/popup.css @@ -53,7 +53,7 @@ .pop_tb_type01>table>tbody>tr>th p {line-height: 1.3;} .pop_tb_type01>table>tbody>tr>td{padding: 10px; height: 55px; font-size:1.5rem; font-weight: 300; color: #555; vertical-align: middle; line-height: 1.4;} .pop_tb_type01>table>tbody>tr>td textarea {width: 100%; height: 80px; font-size: 1.5rem; padding: 10px 15px; box-sizing: border-box;} -.pop_tb_type01>table>tbody>tr>td button {font-size: 1.5rem; height: 35px; padding: 0 15px;} +.pop_tb_type01>table>tbody>tr>td button {font-size: 1.5rem; height: 32px; padding: 0 15px;border-radius:5px; vertical-align: middle;} .pop_tb_type01>table>tbody>tr>td .duet-date__nav button{padding: 0; height: 35px;} .pop_tb_type01>table>tbody>tr>td .file_cf {margin: 5px 0 0 0; font-size: 1.5rem;} diff --git a/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js b/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js index cce745e8..027c82a4 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js +++ b/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js @@ -309,6 +309,23 @@ function commonPopLayerClose() { $("[data-focus=list_popup_close]").trigger("click"); } +function commonPopLayerClose(maskYn, popClass){ + // maskYn - 마스크 유무 + // popClass - 팝업의 클래스 (공통적인 클래스 말고 고유 클래스 추가, id는 혹시나 개발팀 사용할까봐 클래스 이용) + + if(maskYn == "N"){ + $(".mask").hide(); + $("."+popClass).find(".tooltip-close").trigger("click"); + }else{ + if(popClass != ""){ + // 팝업이 닫히고 다른팝업이 열리는 경우 + $(".mask").show(); + $("."+popClass).hide(); + } + + } +} + function commonPopWindowopenForm(surl, popupwidth, popupheight, name, frm) { alert("12"); if (popupwidth > screen.width) From c33b6281eeb89e605fcf45fad1b547614806682c Mon Sep 17 00:00:00 2001 From: subsub Date: Thu, 30 Oct 2025 15:01:26 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E3=84=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/visitEdu/usr/publish/edu_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/visitEdu/usr/publish/edu_detail.html b/src/main/webapp/visitEdu/usr/publish/edu_detail.html index 729805e4..bf44138d 100644 --- a/src/main/webapp/visitEdu/usr/publish/edu_detail.html +++ b/src/main/webapp/visitEdu/usr/publish/edu_detail.html @@ -27,7 +27,7 @@ - +ㅇ From 7acd46a14d16b7bbb6efb3b4f31d05138771e1af Mon Sep 17 00:00:00 2001 From: subsub Date: Thu, 30 Oct 2025 15:01:44 +0900 Subject: [PATCH 5/7] test --- src/main/webapp/visitEdu/usr/publish/edu_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/visitEdu/usr/publish/edu_detail.html b/src/main/webapp/visitEdu/usr/publish/edu_detail.html index bf44138d..729805e4 100644 --- a/src/main/webapp/visitEdu/usr/publish/edu_detail.html +++ b/src/main/webapp/visitEdu/usr/publish/edu_detail.html @@ -27,7 +27,7 @@ -ㅇ + From dd5e1a1b5a18f75866376f373ac140e80ffa1952 Mon Sep 17 00:00:00 2001 From: subsub Date: Thu, 30 Oct 2025 15:02:36 +0900 Subject: [PATCH 6/7] =?UTF-8?q?(=EC=82=AC=EC=9A=A9=EC=9E=90)=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=EC=9D=B8=20=EC=A0=95=EB=B3=B4=20=ED=8C=9D=EC=97=85=20?= =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=EB=8F=99=EC=9D=98=20?= =?UTF-8?q?=EC=98=81=EC=97=AD=20=EC=88=98=EC=A0=95,=20=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EB=8C=80=EC=83=81=EC=9E=90=ED=99=95=EC=9D=B8=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20=EB=8B=AB=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EA=B5=90=EC=9C=A1=EC=8B=A0=EC=B2=AD=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=8B=A0=EC=B2=AD=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EA=B8=B0=EB=8A=A5=20=EC=82=AD=EC=A0=9C,?= =?UTF-8?q?=20=ED=91=B8=ED=84=B0=20=EC=83=88=EC=B0=BD=EC=97=B4=EB=A6=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/visitEdu/usr/publish/css/content.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index a3134c86..d36084fd 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -1,4 +1,4 @@ - + .btn_cal{width: 20px; height: 20px; position: absolute; right: 15px; top: 0; background-repeat: no-repeat;} .btn_cal i{display: inline-block; width: 20px; height: 20px; background-image: url(/ipedu/visitEdu/usr/publish/images/content/icon_calendar.png); background-repeat: no-repeat; background-position: center;} From 3ddd385a554e495214eaa6b772d681444fc8523d Mon Sep 17 00:00:00 2001 From: subsub Date: Thu, 30 Oct 2025 16:03:22 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EB=A9=94=EC=9D=B8=20css=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=ED=8C=9D=EC=97=85=20=ED=8F=B0=ED=8A=B8=20?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp | 1 + src/main/webapp/visitEdu/usr/publish/css/common.css | 2 +- src/main/webapp/visitEdu/usr/publish/css/main.css | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 745ff659..017d1127 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -99,6 +99,7 @@ function fn_egov_inqire_data(bbsId, nttId) { .pop-layer p.ctxt {color: #666;line-height: 25px;} .pop-layer .btn-r {display: flex; width: 100%; padding-top: 10px;border-top: 1px solid #DDD;text-align: right; justify-content: space-between; padding:10px 15px; box-sizing: border-box; align-items: center;} .pop-layer {display: none;background-color: #fff;z-index: 999;} + .pop-conts a{font-size:1.6rem;} #tdCheck+label{overflow: hidden;border: 0;width: 1px;height: 1px;clip: rect(1px, 1px, 1px, 1px);clip-path: inset(50%);} .btn-layerClose{width: 16px; height: 16px; background-image: url(${pageContext.request.contextPath}/kccadrPb/usr/image/common/btn_close.png); background-repeat: no-repeat; background-size: 100%;} .today_close{font-size:1.6rem;} diff --git a/src/main/webapp/visitEdu/usr/publish/css/common.css b/src/main/webapp/visitEdu/usr/publish/css/common.css index 4024d061..5fce13db 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/common.css +++ b/src/main/webapp/visitEdu/usr/publish/css/common.css @@ -125,7 +125,7 @@ footer .area_top ul:not(.sns) li:first-child i{background:url(../images/common/i footer .area_top .sns{gap:46px;} footer .area_bottom .inner{display:flex;padding:60px 25px 100px 25px;gap:170px;align-items:center;} footer address{color:#8a8a8a;} -footer address p{font-size:2.3rem;line-height:1.5;margin:0 0 8px 0;} +footer address p{font-size:2.1rem;line-height:1.5;} footer address span{font-size:2.3rem;font-weight:600;color:#c4c4c4;} @media (max-width: 1480px) { diff --git a/src/main/webapp/visitEdu/usr/publish/css/main.css b/src/main/webapp/visitEdu/usr/publish/css/main.css index b06cc220..8074312a 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/main.css +++ b/src/main/webapp/visitEdu/usr/publish/css/main.css @@ -1,7 +1,7 @@ .main{width:100%;margin:145px 0 0 0;} .section{padding:60px 0;box-sizing:border-box;} .main_title{display:flex;align-items:center;margin:0 0 25px 0;} -.main_title h2.title{font-size:3.5rem;font-weight:500;color:#333;} +.main_title h2.title{font-size:3.3rem;font-weight:500;color:#333;} .main .btn{padding:0;} .main_title .btn_plus{width:50px;height:50px;border:1px solid #dddddd;border-radius:100%;background:#fff;} .main_title .btn_plus i{display:inline-block;width:100%;height:100%;background:url(/ipedu/visitEdu/usr/publish/images/main/icon_plus.png) no-repeat center center;transition:transform 0.2s;} @@ -12,7 +12,7 @@ .section01::before{position:absolute;content:"";width:100%;height:100%;background-image: url(../images/main/sec01_left_obj.png), url(../images/main/sec01_right_obj.png);background-repeat:no-repeat;background-position: left bottom, right top;left:0;top:0;z-index:0;} .section01::after{position:absolute;content:"";width:100%;height:100%;background:linear-gradient(360deg,rgba(255, 255, 255, 1) 66%, rgba(214, 229, 243, 1) 100%);;background-size:cover;left:0;top:0;z-index:-2;} .section01 .inner{position:relative;background-image: url(../images/main/sec01_left_icon.png), url(../images/main/sec01_right_icon.png);background-repeat:no-repeat;background-position: 30px 15px, calc(100% - 60px) 15px;z-index:1;} -.section01 .main_title{font-family:'Gmarket Sans TTF';font-size:5.3rem;font-weight:bold;color:#253c69;letter-spacing:-.45px;line-height:1.5;justify-content:center;} +.section01 .main_title{font-family:'Gmarket Sans TTF';font-size:5.1rem;font-weight:bold;color:#253c69;letter-spacing:-.45px;line-height:1.5;justify-content:center;} .section01 .box_wrap{display:flex;width:100%;flex-wrap:wrap;gap:30px;margin:0 0 0 auto;} .section01 .box_wrap li{width:calc((100% / 3) - 20px);padding:45px 40px;border-radius:20px;box-sizing:border-box;} .section01 .box_wrap .box{display:flex;min-height:220px;flex-direction:column;justify-content:space-between;word-break:keep-all;} @@ -24,7 +24,7 @@ .section01 .box_wrap li:nth-child(3){background:#01a3cc url(/ipedu/visitEdu/usr/publish/images/main/logo_mint.png) no-repeat calc(100% + 42px) calc(100% + 9px);} .section01 .link_area{display:flex;align-items:center;gap:13px;} -.section01 .btn{display:flex;width:175px;height:70px;font-size:2.3rem;font-weight:500;border-radius:60px;align-items:center;justify-content:center;transition:box-shadow 0.3s;} +.section01 .btn{display:flex;width:175px;height:65px;font-size:2.3rem;font-weight:500;border-radius:60px;align-items:center;justify-content:center;transition:box-shadow 0.3s;} .section01 .btn:hover{box-shadow:0 0 16px 8px rgba(0,0,0,0.1);} .section01 .btn.line{border:1px solid #fff;color:#fff;} .section01 .btn.fill{background:#fff;}