From 901841ddf0db10a423d18e63d096c784c1bc5553 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 19 Dec 2022 18:42:44 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=EC=B2=AD=EC=B7=A8=EC=9D=98=EA=B2=AC?= =?UTF-8?q?=5F=EA=B8=B0=EB=8A=A5=EB=B3=80=EA=B2=BD=5F221216=5F=EC=B5=9C?= =?UTF-8?q?=EC=A2=85.ppt=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/kccadr/cmm/KccadrConstants.java | 2 + .../kcc/kccadr/message/SchedulerUtil.java | 12 ++- .../jsp/web/kccadr/accdnt/ans/ansSubmit.jsp | 2 +- .../ars/tab/adjstReqStatusTabDetail.jsp | 2 +- .../ars/tab/adjstReqStatusTabNormal.jsp | 7 +- .../web/kccadr/adjst/adjstReqRegistStep2.jsp | 78 +++++++++++++++---- .../web/kccadr/adjst/adjstReqRegistStep3.jsp | 8 +- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 36 ++++++--- 8 files changed, 110 insertions(+), 37 deletions(-) diff --git a/src/main/java/kcc/kccadr/cmm/KccadrConstants.java b/src/main/java/kcc/kccadr/cmm/KccadrConstants.java index 076f3899..a6d68bf7 100644 --- a/src/main/java/kcc/kccadr/cmm/KccadrConstants.java +++ b/src/main/java/kcc/kccadr/cmm/KccadrConstants.java @@ -244,6 +244,8 @@ public class KccadrConstants { * * */ + public static final String ADR_MODE_UPT_TO_GOPREV = "prevAfterUpt"; // 수정 후 전 단계 이동 + public static final String ADR_MODE_UPT = "Upt"; // 수정 public static final String ADR_MODE_NEW = "New"; // 등록 diff --git a/src/main/java/kcc/kccadr/message/SchedulerUtil.java b/src/main/java/kcc/kccadr/message/SchedulerUtil.java index 1e0a5bd3..b51cccbc 100644 --- a/src/main/java/kcc/kccadr/message/SchedulerUtil.java +++ b/src/main/java/kcc/kccadr/message/SchedulerUtil.java @@ -67,8 +67,7 @@ public class SchedulerUtil { @Scheduled(cron = "0 0/1 * * * *") // @SchedulerLock(name = "kakaoAtSendPrcs", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN) public void kakaoAtSendPrcs() throws Exception { - System.out.println("===========at scheduler run============"); - log.error("===========at scheduler run============"); +// log.error("===========at scheduler run============"); String hostAddr = null; @@ -93,8 +92,7 @@ public class SchedulerUtil { } try { - System.out.println("server ip ============" + hostAddr); - log.error("server ip ============" + hostAddr); +// log.error("server ip ============" + hostAddr); // if(hostAddr.equals(myLocalIp) || hostAddr.equals(devOutIp) || hostAddr.equals(devInIp) || hostAddr.equals(dmzIp1) || hostAddr.equals(dmzIp2) || hostAddr.equals(containerIp) ) { @@ -121,11 +119,11 @@ public class SchedulerUtil { } catch (Exception e) { - System.out.println(e.getMessage()); + e.printStackTrace(); +// System.out.println(e.getMessage()); } - System.out.println("===========at scheduler finish============"); - log.error("===========at scheduler finish============"); +// log.error("===========at scheduler finish============"); } @Bean diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp index 77c59f05..bbd63b61 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp @@ -207,7 +207,7 @@

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp index 7e63602c..117f3974 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp @@ -572,7 +572,7 @@ resInfo--%>
- + <%-- 조정 대리인 신청(기일참관인)은 입금완료 후 부터 기일조서 결재완료 전까지 노출 --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabNormal.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabNormal.jsp index b5420b08..13c177a5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabNormal.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabNormal.jsp @@ -617,6 +617,7 @@ + @@ -625,6 +626,7 @@ + @@ -642,10 +644,11 @@ - -

+ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp index a3b4ad2d..a6160dc0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp @@ -52,7 +52,7 @@ AdjstReq.step2Onload(); - /* 피 신청인 조회 버튼 Function */ + /* 피 신청인 조회 버튼 Function $('.respondentSch').on('click', function(e){ // 피신청인 구분 tbody @@ -88,6 +88,7 @@ // ajax 호출 ajaxValueChk(rpplNm, rpplEmail); }); + */ function ajaxValueChk(rpplNm, rpplEmail){ @@ -123,6 +124,54 @@ } }); + + $(document).on('click', '.emailCheck', function(){ + + if($(this).is(':checked')) + { + + // 피신청인 구분 => _1 / _2 / _3 + var rpplGb = $(this).attr('data-info'); + + $('#rpplEmail1'+rpplGb).val(''); + $('#rpplEmail2'+rpplGb).val(''); + $('#rpplEmailSelect'+rpplGb).prop("selected", false); + $('#rpplEmailSelect'+rpplGb).val(''); + + } + + }); + + /* + * @.rpplEmailSelectClass => 직접입력 select box + * @.input_email => 이메일 입력 input box + * @ discription : + */ + $(document).on('change', '.rpplEmailSelectClass, .input_email', function(){ + if($(this).val()) + { + var $cheTag = $(this).closest('td').find('.emailCheck'); + if($cheTag.is(':checked')) + { + $cheTag.prop('checked', false); + } + } + }); + + +// $(document).on('change', '.input_email', function(){ + +// if($(this).val()) +// { +// var $cheTag = $(this).closest('td').find('.emailCheck'); +// if($cheTag.is(':checked')) +// { +// $cheTag.prop('checked', false); +// } +// } +// }); + + @@ -177,7 +226,7 @@ @@ -190,7 +239,7 @@ @@ -222,7 +271,7 @@ @@ -256,7 +305,7 @@ @@ -377,7 +426,7 @@ @@ -390,7 +439,7 @@ @@ -423,7 +472,7 @@ @@ -457,7 +506,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp index 89cb1aa0..60ccfc15 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp @@ -75,6 +75,11 @@ $( document ).ready(function(){ }); }); +function fncGoPrev() { + var returnVal = AdjstReq.step3Save(""); + console.log('returnVal :: ', returnVal) +// AdjstReq.fncGoPrev(); +} //미리보기 팝업 function fn_adjstReq_preview() { @@ -235,7 +240,8 @@ function fn_adjstReq_preview() {
-
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index ae23c08a..1101a805 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -87,8 +87,12 @@ var AdjstReq = { copyTb.find("tr[usrTy=02],tr[usrTy=03]").hide(); copyTb.find("input[name=rpplAddrCpYn]").prop("checked", false); copyTb.find("caption").text("피신청인"+ (len+1) +" 정보: 피신청인 분류, 피신청인 이름, 주소, 이메일, 연락처, 이메일 수신여부, SMS 수신여부, 우편물 수령지등 정보입력"); - + // 20221219 + // 이메일 주소 모름 check box 추가로 인해 생성 + copyTb.find(".emailCheck").eq(0).prop("checked" , true); + copyTb.find(".emailCheck").eq(0).attr('data-info', '_'+(len+1)); + // id값 체인지 id가 필요는 없지만 라벨때문에 처리.. var elements = copyTb.find("label"); $.each(elements,function(idx, elm){ @@ -414,6 +418,7 @@ var AdjstReq = { var targetObj = $(".personWarp"); $.each(targetObj, function(idx , obj){ + console.log(obj); saveList.push(AdjstReq.getResPersonData($(this))); }); @@ -523,7 +528,7 @@ var AdjstReq = { if(!this.validStep(this.STEP)){ return false; } - + var data = new FormData($("#"+this.STEP)[0]); //첨부파일 등록 처리 _fileForm2.forEach(function(obj, idx) { @@ -537,6 +542,9 @@ var AdjstReq = { }else if(mode == "${KccadrConstants.ADR_MODE_SMT}"){ msg = "조정신청서를 최종 제출하시겠습니까?"; endMsg = "조정신청서 제출이 완료되었습니다."; + }else if(mode == "${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}"){ // 수정 후 전 페이지 + msg = "등록된 내용을 저장하시겠습니까?"; + endMsg = "저장이 완료되었습니다."; } // 등록 구분 코드 삽입.. @@ -565,6 +573,8 @@ var AdjstReq = { $("#atchFileId").val(returnData.rsVO.atchFileId); if(mode == "${KccadrConstants.ADR_MODE_SMT}"){ AdjstReq.fncGoMyAdjstListPage(); + }else if(mode == "${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}"){ // 수정 후 전 페이지 + AdjstReq.fncGoPrev(); }else{ if(previewYn != 'Y'){ AdjstReq.fncGoRefresh(); @@ -933,15 +943,19 @@ var AdjstReq = { } - if(resPerson.rpplEmail1 == ''){ - alert("이메일을 입력해 주세요."); - return flag = false; - } - - if(resPerson.rpplEmail2 == ''){ - alert("이메일 도메인 정보를 입력해 주세요."); - return flag = false; - } + /* + if(resPerson.rpplEmail1 == ''){ + alert("이메일을 입력해 주세요."); + return flag = false; + } + + if(resPerson.rpplEmail2 == ''){ + alert("이메일 도메인 정보를 입력해 주세요."); + return flag = false; + } + */ + + if(!AdjstReq.TEL_REGEXP.test(resPerson.rpplPhone1+resPerson.rpplPhone2+resPerson.rpplPhone3)){ alert("피신청인["+idxNo+"] 연락처 지역번호 및 휴대폰 앞자리를 확인해주세요."); return flag = false;
조정진행 상세 - 조정기록 : 일자, 등록인, 문건명, 상대방 공개여부 등 정보제공
번호 일자 등록인 문건명 +

+

- +
- +
-

필수입력 항목*

+

이메일

 @@ -264,10 +313,10 @@ @ - - - + + +
- +
- +
- +
-

필수입력 항목*

+

이메일

 @@ -467,8 +516,9 @@ - - + + "/> +