From a279b4fa12053ece4185011213e99d47401a78f5 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 2 Jun 2023 13:51:23 +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=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/cmm/XitUserInfoChangeDtlsVO.java | 19 ++----- .../framework/biz/mng/user/XitUserInfoVO.java | 2 - .../biz/mng/user/XitUserRegMngVO.java | 8 --- .../cmm/XitFrameCrud-mysql-mapper.xml | 54 +++++-------------- .../mng/usr/XitUserEtcOptMng-mysql-mapper.xml | 4 +- .../framework/mng/usr/user-mysql-mapper.xml | 14 ----- .../framework/mng/usr/XitUserRegMng.xml | 32 ++--------- .../biz/cmm/anonymous/XitUserReg_input.jsp | 8 +-- .../biz/cmm/anonymous/forms/UserForm.jsp | 8 +-- .../biz/mng/usr/backup/XitUserRegMng_edit.jsp | 8 +-- .../mng/usr/backup/XitUserRegMng_input.jsp | 8 +-- .../biz/mng/usr/backup/XitUserRegMng_view.jsp | 8 +-- .../framework/biz/mng/usr/mngUserMgtPopup.jsp | 8 +-- 13 files changed, 33 insertions(+), 148 deletions(-) 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 a0e4d386..f4f6b22b 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 @@ -27,14 +27,14 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { protected String brthdy; //생일 protected String fxnum; //팩스번호 protected String house_adres; //주택 주소 - protected String house_end_telno; //주택 끝 전화번호 + protected String area_no; //지역 번호 protected String detail_adres; //상세 주소 protected String zip; //우편번호 protected String offm_telno; //사무실 전화번호 protected String mbtlnum; //이동전화번호 protected String email_adres; //이메일 주소 - protected String house_middle_telno; //주택 중간 전화번호 + protected String pstinst_code; //소속기관 코드 protected String user_sttus_code; //사용자 상태 코드 protected String esntl_id; //고유 id @@ -93,12 +93,8 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { public void setHouse_adres(String house_adres) { this.house_adres = house_adres; } - public String getHouse_end_telno() { - return house_end_telno; - } - public void setHouse_end_telno(String house_end_telno) { - this.house_end_telno = house_end_telno; - } + + public String getArea_no() { return area_no; } @@ -135,12 +131,7 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { public void setEmail_adres(String email_adres) { this.email_adres = email_adres; } - public String getHouse_middle_telno() { - return house_middle_telno; - } - public void setHouse_middle_telno(String house_middle_telno) { - this.house_middle_telno = house_middle_telno; - } + public String getPstinst_code() { return pstinst_code; } 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 489b3486..5fd931e3 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 @@ -36,7 +36,6 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String houseAdres; //주택 주소 protected String passwordHint; //비밀번호 힌트 protected String passwordCnsr; //비밀번호 정답 - protected String houseEndTelno; //주택 끝 전화번호 protected String areaNo; //지역 번호 protected String detailAdres; //상세 주소 protected String zip; //우편번호 @@ -44,7 +43,6 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String mbtlnum; //이동전화번호 protected String emailAdres; //이메일 주소 protected String ofcpsNm; //직위 명 - protected String houseMiddleTelno; //주택 중간 전화번호 protected String groupId; //그룹 id - 업무그룹(sgg_cd) protected String pstinstCode; //소속기관 코드 - 시스템코드(sysSeCd) protected String userSttusCode; //사용자 상태 코드 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 1aebe4a9..06fe97ea 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 @@ -84,14 +84,6 @@ public class XitUserRegMngVO extends BaseVO { * 집 주소 */ private String houseAdres; - /** - * 집끝전화번호 - */ - private String houseEndTelno; - /** - * 집중간전화번호 - */ - private String houseMiddleTelno; /** * 소속기관코드 */ 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 8b540fbc..5a16a1ad 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 @@ -2073,15 +2073,13 @@ ,SEXDSTN_CODE ,BRTHDY ,FXNUM - ,HOUSE_ADRES - ,HOUSE_END_TELNO + ,HOUSE_ADRES ,AREA_NO ,DETAIL_ADRES ,ZIP ,OFFM_TELNO ,MBTLNUM - ,EMAIL_ADRES - ,HOUSE_MIDDLE_TELNO + ,EMAIL_ADRES ,PSTINST_CODE ,USER_STTUS_CODE ,ESNTL_ID @@ -2096,14 +2094,12 @@ AND BRTHDY = #{brthdy } AND FXNUM = #{fxnum } AND HOUSE_ADRES = #{house_adres } - AND HOUSE_END_TELNO = #{house_end_telno } AND AREA_NO = #{area_no } AND DETAIL_ADRES = #{detail_adres } AND ZIP = #{zip } AND OFFM_TELNO = #{offm_telno } AND MBTLNUM = #{mbtlnum } AND EMAIL_ADRES = #{email_adres } - AND HOUSE_MIDDLE_TELNO = #{house_middle_telno} AND PSTINST_CODE = #{pstinst_code } AND USER_STTUS_CODE = #{user_sttus_code } AND ESNTL_ID = #{esntl_id } @@ -2119,15 +2115,13 @@ ,SEXDSTN_CODE ,BRTHDY ,FXNUM - ,HOUSE_ADRES - ,HOUSE_END_TELNO + ,HOUSE_ADRES ,AREA_NO ,DETAIL_ADRES ,ZIP ,OFFM_TELNO ,MBTLNUM - ,EMAIL_ADRES - ,HOUSE_MIDDLE_TELNO + ,EMAIL_ADRES ,PSTINST_CODE ,USER_STTUS_CODE ,ESNTL_ID @@ -2149,14 +2143,12 @@ ,BRTHDY ,FXNUM ,HOUSE_ADRES - ,HOUSE_END_TELNO ,AREA_NO ,DETAIL_ADRES ,ZIP ,OFFM_TELNO ,MBTLNUM ,EMAIL_ADRES - ,HOUSE_MIDDLE_TELNO ,PSTINST_CODE ,USER_STTUS_CODE ,ESNTL_ID @@ -2170,14 +2162,12 @@ ,#{brthdy } ,#{fxnum } ,#{house_adres } - ,#{house_end_telno } ,#{area_no } ,#{detail_adres } ,#{zip } ,#{offm_telno } ,#{mbtlnum } ,#{email_adres } - ,#{house_middle_telno} ,#{pstinst_code } ,#{user_sttus_code } ,#{esntl_id } @@ -2196,14 +2186,12 @@ ,BRTHDY = #{brthdy } ,FXNUM = #{fxnum } ,HOUSE_ADRES = #{house_adres } - ,HOUSE_END_TELNO = #{house_end_telno } ,AREA_NO = #{area_no } ,DETAIL_ADRES = #{detail_adres } ,ZIP = #{zip } ,OFFM_TELNO = #{offm_telno } ,MBTLNUM = #{mbtlnum } ,EMAIL_ADRES = #{email_adres } - ,HOUSE_MIDDLE_TELNO = #{house_middle_telno} ,PSTINST_CODE = #{pstinst_code } ,USER_STTUS_CODE = #{user_sttus_code } ,ESNTL_ID = #{esntl_id } @@ -2243,16 +2231,14 @@ ,FXNUM ,HOUSE_ADRES ,PASSWORD_HINT - ,PASSWORD_CNSR - ,HOUSE_END_TELNO + ,PASSWORD_CNSR ,AREA_NO ,DETAIL_ADRES ,ZIP ,OFFM_TELNO ,MBTLNUM ,EMAIL_ADRES - ,OFCPS_NM - ,HOUSE_MIDDLE_TELNO + ,OFCPS_NM ,GROUP_ID ,PSTINST_CODE ,USER_STTUS_CODE @@ -2272,7 +2258,6 @@ AND HOUSE_ADRES = #{house_adres } AND PASSWORD_HINT = #{password_hint } AND PASSWORD_CNSR = #{password_cnsr } - AND HOUSE_END_TELNO = #{house_end_telno } AND AREA_NO = #{area_no } AND DETAIL_ADRES = #{detail_adres } AND ZIP = #{zip } @@ -2280,7 +2265,6 @@ AND MBTLNUM = #{mbtlnum } AND EMAIL_ADRES = #{email_adres } AND OFCPS_NM = #{ofcps_nm } - AND HOUSE_MIDDLE_TELNO = #{house_middle_telno } AND GROUP_ID = #{group_id } AND PSTINST_CODE = #{pstinst_code } AND USER_STTUS_CODE = #{user_sttus_code } @@ -2300,16 +2284,14 @@ ,FXNUM ,HOUSE_ADRES ,PASSWORD_HINT - ,PASSWORD_CNSR - ,HOUSE_END_TELNO + ,PASSWORD_CNSR ,AREA_NO ,DETAIL_ADRES ,ZIP ,OFFM_TELNO ,MBTLNUM ,EMAIL_ADRES - ,OFCPS_NM - ,HOUSE_MIDDLE_TELNO + ,OFCPS_NM ,GROUP_ID ,PSTINST_CODE ,USER_STTUS_CODE @@ -2336,7 +2318,6 @@ , house_adres , password_hint , password_cnsr - , house_end_telno , area_no , detail_adres , zip @@ -2344,7 +2325,6 @@ , mbtlnum , email_adres , ofcps_nm - , house_middle_telno , group_id , pstinst_code , user_sttus_code @@ -2363,7 +2343,6 @@ , #{houseAdres} , #{passwordHint} , #{passwordCnsr} - , #{houseEndTelno} , #{areaNo} , #{detailAdres} , #{zip} @@ -2371,7 +2350,6 @@ , #{mbtlnum} , #{emailAdres} , #{ofcpsNm} - , #{houseMiddleTelno} , #{groupId} , #{pstinstCode} , #{userSttusCode} @@ -2396,7 +2374,6 @@ ,HOUSE_ADRES = #{house_adres } ,PASSWORD_HINT = #{password_hint } ,PASSWORD_CNSR = #{password_cnsr } - ,HOUSE_END_TELNO = #{house_end_telno } ,AREA_NO = #{area_no } ,DETAIL_ADRES = #{detail_adres } ,ZIP = #{zip } @@ -2404,7 +2381,6 @@ ,MBTLNUM = #{mbtlnum } ,EMAIL_ADRES = #{email_adres } ,OFCPS_NM = #{ofcps_nm } - ,HOUSE_MIDDLE_TELNO = #{house_middle_telno } ,GROUP_ID = #{group_id } ,PSTINST_CODE = #{pstinst_code } ,USER_STTUS_CODE = #{user_sttus_code } @@ -2433,16 +2409,14 @@ ,A.FXNUM ,A.HOUSE_ADRES ,A.PASSWORD_HINT - ,A.PASSWORD_CNSR - ,A.HOUSE_END_TELNO + ,A.PASSWORD_CNSR ,A.AREA_NO ,A.DETAIL_ADRES ,A.ZIP ,A.OFFM_TELNO ,A.MBTLNUM ,A.EMAIL_ADRES - ,A.OFCPS_NM - ,A.HOUSE_MIDDLE_TELNO + ,A.OFCPS_NM ,A.GROUP_ID ,A.PSTINST_CODE ,A.USER_STTUS_CODE @@ -2467,7 +2441,6 @@ AND A.HOUSE_ADRES = #{house_adres } AND A.PASSWORD_HINT = #{password_hint } AND A.PASSWORD_CNSR = #{password_cnsr } - AND A.HOUSE_END_TELNO = #{house_end_telno } AND A.AREA_NO = #{area_no } AND A.DETAIL_ADRES = #{detail_adres } AND A.ZIP = #{zip } @@ -2475,7 +2448,6 @@ AND A.MBTLNUM = #{mbtlnum } AND A.EMAIL_ADRES = #{email_adres } AND A.OFCPS_NM = #{ofcps_nm } - AND A.HOUSE_MIDDLE_TELNO = #{house_middle_telno } AND A.GROUP_ID = #{group_id } AND A.PSTINST_CODE = #{pstinst_code } AND A.USER_STTUS_CODE = #{user_sttus_code } @@ -2499,16 +2471,14 @@ ,A.FXNUM ,A.HOUSE_ADRES ,A.PASSWORD_HINT - ,A.PASSWORD_CNSR - ,A.HOUSE_END_TELNO + ,A.PASSWORD_CNSR ,A.AREA_NO ,A.DETAIL_ADRES ,A.ZIP ,A.OFFM_TELNO ,A.MBTLNUM ,A.EMAIL_ADRES - ,A.OFCPS_NM - ,A.HOUSE_MIDDLE_TELNO + ,A.OFCPS_NM ,A.GROUP_ID ,A.PSTINST_CODE ,A.USER_STTUS_CODE 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 ccc1b401..f43a540f 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 @@ -83,9 +83,7 @@ ,A.EMPL_NO AS "emplNo" ,A.SEXDSTN_CODE AS "sexdstnCode" ,A.BRTHDY AS "brthdy" - ,A.AREA_NO AS "areaNo" - ,A.HOUSE_MIDDLE_TELNO AS "houseMiddleTelno" - ,A.HOUSE_END_TELNO AS "houseEndTelno" + ,A.AREA_NO AS "areaNo" ,A.FXNUM AS "fxnum" ,A.HOUSE_ADRES AS "houseAdres" ,A.DETAIL_ADRES AS "detailAdres" 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 6157cef3..46114dc3 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 @@ -13,8 +13,6 @@ , xui.user_nm , xui.email_adres , xui.area_no - , xui.house_middle_telno - , xui.house_end_telno , xui.mbtlnum , xui.group_id , xui.user_sttus_code @@ -51,8 +49,6 @@ , sexdstn_code , brthdy , area_no - , house_middle_telno - , house_end_telno , fxnum , house_adres , detail_adres @@ -86,7 +82,6 @@ , house_adres , password_hint , password_cnsr - , house_end_telno , area_no , detail_adres , zip @@ -94,7 +89,6 @@ , mbtlnum , email_adres , ofcps_nm - , house_middle_telno , group_id , pstinst_code , user_sttus_code @@ -113,7 +107,6 @@ , #{houseAdres} , #{passwordHint} , #{passwordCnsr} - , #{houseEndTelno} , #{areaNo} , #{detailAdres} , #{zip} @@ -121,7 +114,6 @@ , #{mbtlnum} , #{emailAdres} , #{ofcpsNm} - , #{houseMiddleTelno} , #{groupId} , #{pstinstCode} , #{userSttusCode} @@ -144,8 +136,6 @@ , zip = IF(zip = #{zip}, zip, #{zip}) , house_adres = IF(house_adres = #{houseAdres}, house_adres, #{houseAdres}) , detail_adres = IF(detail_adres = #{detailAdres}, detail_adres, #{detailAdres}) - , house_middle_telno = IF(house_middle_telno = #{houseMiddleTelno}, house_middle_telno, #{houseMiddleTelno}) - , house_end_telno = IF(house_end_telno = #{houseEndTelno}, house_end_telno, #{houseEndTelno}) , area_no = IF(area_no = #{areaNo}, area_no, #{areaNo}) , offm_telno = IF(offm_telno = #{offmTelno}, offm_telno, #{offmTelno}) , mbtlnum = IF(mbtlnum = #{mbtlnum}, mbtlnum, #{mbtlnum}) @@ -372,14 +362,12 @@ , brthdy , fxnum , house_adres - , house_end_telno , area_no , detail_adres , zip , offm_telno , mbtlnum , email_adres - , house_middle_telno , pstinst_code , user_sttus_code , esntl_id @@ -392,14 +380,12 @@ , brthdy , fxnum , house_adres - , house_end_telno , area_no , detail_adres , zip , offm_telno , mbtlnum , email_adres - , house_middle_telno , pstinst_code , user_sttus_code , esntl_id diff --git a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml index 5e3bdc77..75accd69 100644 --- a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml +++ b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml @@ -47,43 +47,17 @@ --> - - + + maxlength - 4 + 10 mask [0-9]([0-9])* - - - - - maxlength - 4 - - - mask - [0-9][0-9][0-9]([0-9])* - - - - - - - maxlength - 4 - - - mask - [0-9][0-9][0-9][0-9] - - 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 1f0c062f..52a5cc18 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 @@ -235,15 +235,11 @@ 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 57ab1477..5037933d 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 @@ -131,15 +131,11 @@ - + - - - - - + - - 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 0c26eb3a..def9161e 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 @@ -180,15 +180,11 @@ 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 3514acdc..d4b5d1dc 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 @@ -128,15 +128,11 @@ - + - - - - - + - - 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 57932d93..01dfbed4 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 @@ -239,15 +239,11 @@ 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 cc0072f7..16ceb38b 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 @@ -123,15 +123,11 @@ - + - - - - - + - -