From 2df0492298c72ec6540e9bdb6d3844340fa9f9d2 Mon Sep 17 00:00:00 2001 From: ijunho Date: Thu, 30 Oct 2025 12:20:14 +0900 Subject: [PATCH] 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(){ - - 성별 - - - - -