From e9490930cf51875423a187bc1c5d7c2ebfac0b0f Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 7 Dec 2022 14:42:32 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=EA=B3=BC=EA=B1=B0=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=EB=93=B1=EB=A1=9D=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EB=A6=AC=EB=A1=9C=EB=94=A9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AdjReqMgrPastServiceImpl.java | 53 ++++++++++++------- .../web/AdjReqMgrPastController.java | 1 - src/main/resources/rebel.xml | 8 +-- .../adjReqMgrPastBasicRegist.jsp | 4 ++ .../webapp/js/kccadr/adjReqMgrPast/init.js | 9 +++- .../webapp/js/kccadr/adjReqMgrPast/value.js | 15 ++++-- 6 files changed, 61 insertions(+), 29 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index 1609ef50..c622f22f 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -223,8 +223,11 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements public ResponseEntity insertAdjReqMgrRpplReq(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{ - //조정 사건 키값 생성 및 디비 생성해주기 - String adrSeq = adrIdgenService.getNextStringId(); // 고유ID + String adrSeq = adrIdgenService.getNextStringId(); // 고유ID + try { + + + //조정 사건 키값 생성 및 디비 생성해주기 adjReqMgrPastVO.setAdrSeq(adrSeq); adjReqMgrPastVO.setReqOlCd(KccadrConstants.ADR_REQ_PAST); //과거이력 구분 코드 2 @@ -453,21 +456,29 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements } } - int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); - int cnt = 1; - while(cnt <= adrSn) + if(StringUtils.isNotEmpty(adjReqMgrPastVO.getAdrSn())) { - adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService - adjReqMgrPastVO.setAdrSn(Integer.toString(cnt)); - adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); - cnt++; + int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); + int cnt = 1; + while(cnt <= adrSn) + { + adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService + adjReqMgrPastVO.setAdrSn(Integer.toString(cnt)); + adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); + cnt++; + } + } adjReqMgrPastVO.setAdrHstrySeq(adrHstrySeqGnrService.getNextStringId()); adjReqMgrPastVO.setAdrSn("0"); adjReqMgrPastDAO.insertAdjReqRecordAjax(adjReqMgrPastVO); - + + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "조정신청 정보 저장이 완료되었습니다.", adrSeq, LocalDateTime.now())); } @@ -974,18 +985,22 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements { if(prtclRowList.size() < 1) { - int adrSn = Integer.parseInt(prmtrAdrSn); - int cnt = 1; - logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn); - while(cnt <= adrSn) + if(StringUtils.isNotEmpty(prmtrAdrSn)) { + int adrSn = Integer.parseInt(prmtrAdrSn); + int cnt = 1; logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn); - adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService - adjReqMgrPastVO.setAdrSn(Integer.toString(cnt)); - adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); - cnt++; + while(cnt <= adrSn) + { + logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn); + adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService + adjReqMgrPastVO.setAdrSn(Integer.toString(cnt)); + adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); + cnt++; + } + adjReqMgrPastDAO.updateAdrSn(adjReqMgrPastVO); + } - adjReqMgrPastDAO.updateAdrSn(adjReqMgrPastVO); } } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index a575a053..b23f1c7c 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -644,7 +644,6 @@ public class AdjReqMgrPastController { //사용자 유니크 아이디 받아오기 adjReqMgrPastVO.setFrstRegisterId(userId); adjReqMgrPastVO.setLastUpdusrId(userId); - //조정신청, 대리인, 신청인 등록 처리 return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO); } diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml index fd1249fe..c2e2c0bc 100644 --- a/src/main/resources/rebel.xml +++ b/src/main/resources/rebel.xml @@ -7,20 +7,20 @@ - + - + - + - \ No newline at end of file + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp index 4f4fc177..259e8817 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -1506,6 +1506,10 @@ function fn_btnLoad(adrSeq){
" />
+ +
" method="post"> + +
diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/init.js b/src/main/webapp/js/kccadr/adjReqMgrPast/init.js index 28271b67..697e7a88 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/init.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/init.js @@ -18,8 +18,13 @@ - var reqTy = ''; // 조정신청 유형 - var rpplTy = ''; // 조정신청 대상 +// var reqTy = ''; // 조정신청 유형 +// var rpplTy = ''; // 조정신청 대상 + var reqTy = $('input[name=reqTy]:checked').val();; // 조정신청 유형 + var rpplTy = $('input[name=rpplTy]:checked').val();; // 조정신청 유형 + + console.log('reqTy : ', reqTy); + console.log('rpplTy : ', rpplTy); //대리인 정보 처리해주기 if (rpplTy == "30") { diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js index 5f6765a1..cf84b6b9 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js @@ -402,8 +402,8 @@ $(".popBtnChk").text("수정"); $(".popBtn").show(); - - fn_btnLoad(data.dataSub); + fn_goDetail(data.dataSub); +// fn_btnLoad(data.dataSub); // $('#nextGoPageForm').submit(); } else if(data.status == 'Unauthorized' || data.status == 'BAD_REQUEST') @@ -415,4 +415,13 @@ }); } - } \ No newline at end of file + } + + + function fn_goDetail(adrSeq){ + + var goForm = document.goForm; + goForm.adrSeq.value = adrSeq; + goForm.submit(); + } + \ No newline at end of file From 002307ce4a41eac3bc7461af1685fb068c153711 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 7 Dec 2022 14:44:41 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=EC=95=94=ED=98=B8=ED=99=94=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java index da8be385..92b0d9a1 100644 --- a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java +++ b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java @@ -1,12 +1,9 @@ package kcc.com.cmm.util; -import java.util.Calendar; -import com.dsmdb.japi.MagicDBAPI; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; @@ -35,13 +32,13 @@ public final class MagicDBAPIUtil { } public static String encryptOnlyOneString(String stringVal) { - return MagicDBAPI.encrypt(POLICY_NAME, stringVal); -// return stringVal; +// return MagicDBAPI.encrypt(POLICY_NAME, stringVal); + return stringVal; } public static String decryptOnlyOneString(String stringVal) { - return MagicDBAPI.decrypt(POLICY_NAME, stringVal); -// return stringVal; +// return MagicDBAPI.decrypt(POLICY_NAME, stringVal); + return stringVal; } } From eb8c705bca04cbff57d08d3f2ec93299be08b2f7 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 7 Dec 2022 14:55:15 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=EC=95=94=ED=98=B8=ED=99=94=20?= =?UTF-8?q?=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java index 3b2ba15e..da8be385 100644 --- a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java +++ b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java @@ -35,13 +35,13 @@ public final class MagicDBAPIUtil { } public static String encryptOnlyOneString(String stringVal) { -// return MagicDBAPI.encrypt(POLICY_NAME, stringVal); - return stringVal; + return MagicDBAPI.encrypt(POLICY_NAME, stringVal); +// return stringVal; } public static String decryptOnlyOneString(String stringVal) { -// return MagicDBAPI.decrypt(POLICY_NAME, stringVal); - return stringVal; + return MagicDBAPI.decrypt(POLICY_NAME, stringVal); +// return stringVal; } }