From e1971323fce1d969d56b07ecc52530e17e42dc0f Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 2 Jun 2023 15:05:00 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20:=20=EC=9C=A0=EC=A0=80=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/xit/fims/biz/cmm/FimsCrackdownDTO.java | 2 +- .../biz/cmm/XitUserInfoChangeDtlsVO.java | 10 +++---- .../framework/biz/mng/user/XitUserInfoVO.java | 2 +- .../biz/mng/user/XitUserRegMngVO.java | 2 +- .../cmm/XitFrameCrud-mysql-mapper.xml | 30 +++++++++---------- .../mng/usr/XitUserEtcOptMng-mysql-mapper.xml | 2 +- .../framework/mng/usr/user-mysql-mapper.xml | 12 ++++---- .../biz/cmm/cmmFimsCrackdownEditPopup.jsp | 6 ++-- .../biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 2 +- .../biz/cmm/anonymous/XitUserReg_input.jsp | 12 ++++---- .../biz/cmm/anonymous/forms/UserForm.jsp | 14 ++++----- .../biz/mng/usr/backup/XitUserRegMng_edit.jsp | 4 +-- .../mng/usr/backup/XitUserRegMng_input.jsp | 12 ++++---- .../biz/mng/usr/backup/XitUserRegMng_view.jsp | 12 ++++---- .../framework/biz/mng/usr/mngUserMgtPopup.jsp | 4 +-- .../js/fims/framework/cmm/cmmPopup.js | 4 +-- 16 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java b/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java index e7c7378f..ea4e0612 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java +++ b/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java @@ -50,7 +50,7 @@ public class FimsCrackdownDTO { private String addrSeCd; private String zip; private String adres; - private String detailAdres; + private String daddr; private String stdgCd; // 서손 diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java index 2ba64638..ad45b32a 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java @@ -29,7 +29,7 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { protected String addr; //주택 주소 protected String area_no; //지역 번호 - protected String detail_adres; //상세 주소 + protected String daddr; //상세 주소 protected String zip; //우편번호 protected String offm_telno; //사무실 전화번호 protected String mbtlnum; //이동전화번호 @@ -101,11 +101,11 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { public void setArea_no(String area_no) { this.area_no = area_no; } - public String getDetail_adres() { - return detail_adres; + public String getDaddr() { + return daddr; } - public void setDetail_adres(String detail_adres) { - this.detail_adres = detail_adres; + public void setDaddr(String daddr) { + this.daddr = daddr; } public String getZip() { return zip; diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java index ab60c5e1..c777589d 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java @@ -37,7 +37,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String passwordHint; //비밀번호 힌트 protected String passwordCnsr; //비밀번호 정답 protected String areaNo; //지역 번호 - protected String detailAdres; //상세 주소 + protected String daddr; //상세 주소 protected String zip; //우편번호 protected String offmTelno; //사무실 전화번호 protected String mbtlnum; //이동전화번호 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java index 58f5e8e7..5224439c 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java @@ -51,7 +51,7 @@ public class XitUserRegMngVO extends BaseVO { /** * 상세주소 */ - private String detailAdres; + private String daddr; /** * 이메일주소 */ diff --git a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml index fe9ff21d..a4881fed 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml @@ -2075,7 +2075,7 @@ ,FXNUM ,ADDR ,AREA_NO - ,DETAIL_ADRES + ,DADDR ,ZIP ,OFFM_TELNO ,MBTLNUM @@ -2095,7 +2095,7 @@ AND FXNUM = #{fxnum } AND ADDR = #{addr } AND AREA_NO = #{area_no } - AND DETAIL_ADRES = #{detail_adres } + AND DADDR = #{daddr } AND ZIP = #{zip } AND OFFM_TELNO = #{offm_telno } AND MBTLNUM = #{mbtlnum } @@ -2117,7 +2117,7 @@ ,FXNUM ,ADDR ,AREA_NO - ,DETAIL_ADRES + ,DADDR ,ZIP ,OFFM_TELNO ,MBTLNUM @@ -2144,7 +2144,7 @@ ,FXNUM ,ADDR ,AREA_NO - ,DETAIL_ADRES + ,DADDR ,ZIP ,OFFM_TELNO ,MBTLNUM @@ -2163,7 +2163,7 @@ ,#{fxnum } ,#{addr } ,#{area_no } - ,#{detail_adres } + ,#{daddr } ,#{zip } ,#{offm_telno } ,#{mbtlnum } @@ -2187,7 +2187,7 @@ ,FXNUM = #{fxnum } ,ADDR = #{addr } ,AREA_NO = #{area_no } - ,DETAIL_ADRES = #{detail_adres } + ,DADDR = #{daddr } ,ZIP = #{zip } ,OFFM_TELNO = #{offm_telno } ,MBTLNUM = #{mbtlnum } @@ -2233,7 +2233,7 @@ ,PASSWORD_HINT ,PASSWORD_CNSR ,AREA_NO - ,DETAIL_ADRES + ,DADDR ,ZIP ,OFFM_TELNO ,MBTLNUM @@ -2259,7 +2259,7 @@ AND PASSWORD_HINT = #{password_hint } AND PASSWORD_CNSR = #{password_cnsr } AND AREA_NO = #{area_no } - AND DETAIL_ADRES = #{detail_adres } + AND DADDR = #{daddr } AND ZIP = #{zip } AND OFFM_TELNO = #{offm_telno } AND MBTLNUM = #{mbtlnum } @@ -2286,7 +2286,7 @@ ,PASSWORD_HINT ,PASSWORD_CNSR ,AREA_NO - ,DETAIL_ADRES + ,DADDR ,ZIP ,OFFM_TELNO ,MBTLNUM @@ -2319,7 +2319,7 @@ , password_hint , password_cnsr , area_no - , detail_adres + , daddr , zip , offm_telno , mbtlnum @@ -2344,7 +2344,7 @@ , #{passwordHint} , #{passwordCnsr} , #{areaNo} - , #{detailAdres} + , #{daddr} , #{zip} , #{offmTelno} , #{mbtlnum} @@ -2375,7 +2375,7 @@ ,PASSWORD_HINT = #{password_hint } ,PASSWORD_CNSR = #{password_cnsr } ,AREA_NO = #{area_no } - ,DETAIL_ADRES = #{detail_adres } + ,DADDR = #{daddr } ,ZIP = #{zip } ,OFFM_TELNO = #{offm_telno } ,MBTLNUM = #{mbtlnum } @@ -2411,7 +2411,7 @@ ,A.PASSWORD_HINT ,A.PASSWORD_CNSR ,A.AREA_NO - ,A.DETAIL_ADRES + ,A.DADDR ,A.ZIP ,A.OFFM_TELNO ,A.MBTLNUM @@ -2442,7 +2442,7 @@ AND A.PASSWORD_HINT = #{password_hint } AND A.PASSWORD_CNSR = #{password_cnsr } AND A.AREA_NO = #{area_no } - AND A.DETAIL_ADRES = #{detail_adres } + AND A.DADDR = #{daddr } AND A.ZIP = #{zip } AND A.OFFM_TELNO = #{offm_telno } AND A.MBTLNUM = #{mbtlnum } @@ -2473,7 +2473,7 @@ ,A.PASSWORD_HINT ,A.PASSWORD_CNSR ,A.AREA_NO - ,A.DETAIL_ADRES + ,A.DADDR ,A.ZIP ,A.OFFM_TELNO ,A.MBTLNUM diff --git a/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml index 7a9c7311..40ef5656 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml @@ -86,7 +86,7 @@ ,A.AREA_NO AS "areaNo" ,A.FXNUM AS "fxnum" ,A.ADDR AS "addr" - ,A.DETAIL_ADRES AS "detailAdres" + ,A.DADDR AS "daddr" ,A.ZIP AS "zip" ,A.OFFM_TELNO AS "offmTelno" ,A.MBTLNUM AS "mbtlnum" diff --git a/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml index ec2dae71..5fc00924 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml @@ -51,7 +51,7 @@ , area_no , fxnum , addr - , detail_adres + , daddr , zip , offm_telno , mbtlnum @@ -83,7 +83,7 @@ , password_hint , password_cnsr , area_no - , detail_adres + , daddr , zip , offm_telno , mbtlnum @@ -108,7 +108,7 @@ , #{passwordHint} , #{passwordCnsr} , #{areaNo} - , #{detailAdres} + , #{daddr} , #{zip} , #{offmTelno} , #{mbtlnum} @@ -135,7 +135,7 @@ , fxnum = IF(fxnum = #{fxnum}, fxnum, #{fxnum}) , zip = IF(zip = #{zip}, zip, #{zip}) , addr = IF(addr = #{addr}, addr, #{addr}) - , detail_adres = IF(detail_adres = #{detailAdres}, detail_adres, #{detailAdres}) + , daddr = IF(daddr = #{daddr}, daddr, #{daddr}) , area_no = IF(area_no = #{areaNo}, area_no, #{areaNo}) , offm_telno = IF(offm_telno = #{offmTelno}, offm_telno, #{offmTelno}) , mbtlnum = IF(mbtlnum = #{mbtlnum}, mbtlnum, #{mbtlnum}) @@ -363,7 +363,7 @@ , fxnum , addr , area_no - , detail_adres + , daddr , zip , offm_telno , mbtlnum @@ -381,7 +381,7 @@ , fxnum , addr , area_no - , detail_adres + , daddr , zip , offm_telno , mbtlnum diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp index c5ff99bd..f5f13ac2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp @@ -235,7 +235,7 @@ Date Author Description 주소 - + @@ -442,7 +442,7 @@ Date Author Description tgtObj.adres.value = zipObj.roadAddrPart1; tgtObj.zip.value = zipObj.zipNo; //tgtObj.zip_view.value = zipObj.zipNo; - tgtObj.detailAdres.value = zipObj.roadAddrPart2 + ' ' + zipObj.addrDetail; + tgtObj.daddr.value = zipObj.roadAddrPart2 + ' ' + zipObj.addrDetail; } ,resetDisplay: (cvlcptRcptNo) => { @@ -594,7 +594,7 @@ Date Author Description ,rtpyrNo: $('input[name=rtpyrNo]').val() ,zip: $('input[name=zip]').val() ,adres: $('input[name=adres]').val() - ,detailAdres: $('input[name=detailAdres]').val() + ,daddr: $('input[name=daddr]').val() } return { diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp index c4a83973..a27f6198 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp @@ -293,7 +293,7 @@ Date Author Description 주소 - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp index 32be916a..b2c74683 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp @@ -89,16 +89,16 @@ function fnSearchAdres(){ ======================== */ function fnSearchAdresCallback(obj){ //검색결과 Set - var totalDetailAdres = ""; // 전체 상세 주소 - totalDetailAdres += obj.addrDetail; - totalDetailAdres += obj.roadAddrPart2; + var totalDaddr = ""; // 전체 상세 주소 + totalDaddr += obj.addrDetail; + totalDaddr += obj.roadAddrPart2; //화면에 출력 document.userManageVO.addr.value = obj.roadAddrPart1; document.userManageVO.zip.value = obj.zipNo; document.userManageVO.zip_view.value = obj.zipNo; - document.userManageVO.detailAdres.value = totalDetailAdres; + document.userManageVO.daddr.value = totalDaddr; } @@ -279,8 +279,8 @@ table { - - + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp index 025316e4..7e14a5dd 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp @@ -180,10 +180,10 @@ - + - - + + @@ -306,15 +306,15 @@ var UserForm = { ======================== */ fnSearchAdresCallback: function(obj){ //검색결과 Set - var totalDetailAdres = ""; // 전체 상세 주소 - totalDetailAdres += obj.addrDetail; - totalDetailAdres += obj.roadAddrPart2; + var totalDaddr = ""; // 전체 상세 주소 + totalDaddr += obj.addrDetail; + totalDaddr += obj.roadAddrPart2; document.userManageVO.addr.value = obj.roadAddrPart1; document.userManageVO.zip.value = obj.zipNo; document.userManageVO.zip_view.value = obj.zipNo; - document.userManageVO.detailAdres.value = totalDetailAdres; + document.userManageVO.daddr.value = totalDaddr; } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp index 83e6affb..1e34f40e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp @@ -223,8 +223,8 @@ table { - - + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp index f698311c..bd90f6dc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp @@ -171,8 +171,8 @@ - - + + @@ -398,16 +398,16 @@ var XitUserRegMng_input = { ======================== */ fnSearchAdresCallback: function(obj){ //검색결과 Set - var totalDetailAdres = ""; // 전체 상세 주소 - totalDetailAdres += obj.addrDetail; - totalDetailAdres += obj.roadAddrPart2; + var totalDaddr = ""; // 전체 상세 주소 + totalDaddr += obj.addrDetail; + totalDaddr += obj.roadAddrPart2; //화면에 출력 document.userManageVO.addr.value = obj.roadAddrPart1; document.userManageVO.zip.value = obj.zipNo; document.userManageVO.zip_view.value = obj.zipNo; - document.userManageVO.detailAdres.value = totalDetailAdres; + document.userManageVO.daddr.value = totalDaddr; } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp index fe4e75ff..06defa00 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp @@ -85,16 +85,16 @@ function fnSearchAdres(){ ======================== */ function fnSearchAdresCallback(obj){ //검색결과 Set - var totalDetailAdres = ""; // 전체 상세 주소 - totalDetailAdres += obj.addrDetail; - totalDetailAdres += obj.roadAddrPart2; + var totalDaddr = ""; // 전체 상세 주소 + totalDaddr += obj.addrDetail; + totalDaddr += obj.roadAddrPart2; //화면에 출력 document.userManageVO.addr.value = obj.roadAddrPart1; document.userManageVO.zip.value = obj.zipNo; document.userManageVO.zip_view.value = obj.zipNo; - document.userManageVO.detailAdres.value = totalDetailAdres; + document.userManageVO.daddr.value = totalDaddr; } @@ -283,8 +283,8 @@ table { - - + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp index fbf49126..de60d6d9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp @@ -166,8 +166,8 @@ - - <%-- --%> + + <%-- --%> diff --git a/src/main/webapp/resources/js/fims/framework/cmm/cmmPopup.js b/src/main/webapp/resources/js/fims/framework/cmm/cmmPopup.js index 1c704af3..9d320c18 100644 --- a/src/main/webapp/resources/js/fims/framework/cmm/cmmPopup.js +++ b/src/main/webapp/resources/js/fims/framework/cmm/cmmPopup.js @@ -375,7 +375,7 @@ const CmmPopup = { * 
      * 주소 검색 Popup 결과를 set하는 콜백 함수
      * @param {Object} zipObj - 주소 검색 결과
-     * @param {Object} tgtObj - 주소 검색 결과값을 Set할 객체(addr, zip, zip_view, detailAdres)
+     * @param {Object} tgtObj - 주소 검색 결과값을 Set할 객체(addr, zip, zip_view, daddr)
      *
      * ex)
      *    var fnCallbackZipSearch = (obj) => CmmPopup.fnSetZipSearch(obj, document.userInfoVO);
@@ -386,7 +386,7 @@ const CmmPopup = {
         tgtObj.addr.value   = zipObj.roadAddrPart1;
         tgtObj.zip.value         = zipObj.zipNo;
         tgtObj.zip_view.value    = zipObj.zipNo;
-        tgtObj.detailAdres.value = zipObj.roadAddrPart2 + ' ' + zipObj.addrDetail;
+        tgtObj.daddr.value = zipObj.roadAddrPart2 + ' ' + zipObj.addrDetail;
 
     }