From 0851930032ed0f78a6e724961b23fcb660d2fba9 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 2 Jun 2023 15:27:21 +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=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/cmm/XitUserInfoChangeDtlsVO.java | 10 +++---- .../cmm/web/XitFrameAnonymousController.java | 6 ++-- .../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 ++++---- 7 files changed, 32 insertions(+), 32 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 ad45b32a..b5e86f2c 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 @@ -23,7 +23,7 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { protected String org_id; //조직 id protected String grp_id; //그룹 id protected String empl_no; //사원 번호 - protected String sexdstn_code; //성별 코드 + protected String gender; //성별 코드 protected String brthdy; //생일 protected String fxnum; //팩스번호 protected String addr; //주택 주소 @@ -69,11 +69,11 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { public void setEmpl_no(String empl_no) { this.empl_no = empl_no; } - public String getSexdstn_code() { - return sexdstn_code; + public String getGender() { + return gender; } - public void setSexdstn_code(String sexdstn_code) { - this.sexdstn_code = sexdstn_code; + public void setGender(String gender) { + this.gender = gender; } public String getBrthdy() { return brthdy; diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java index 689794d2..1b23adc1 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java @@ -122,7 +122,7 @@ public class XitFrameAnonymousController extends AbstractController { * 코드목록 조회 ================*/ model.addAttribute("passwordHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 - model.addAttribute("sexdstnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 + model.addAttribute("gender_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 model.addAttribute("nsttCd_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 model.addAttribute("grpId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 @@ -134,7 +134,7 @@ public class XitFrameAnonymousController extends AbstractController { // ================*/ // //모든 사용자 공통 // model.addAttribute("passwordHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 -// model.addAttribute("sexdstnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 +// model.addAttribute("gender_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 // model.addAttribute("grpId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 // List userSttus_result = xitFrameCodeService.findCmmnDetailCodes("XIT013"); // @@ -182,7 +182,7 @@ public class XitFrameAnonymousController extends AbstractController { * 코드목록 조회 ================*/ model.addAttribute("passwordHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 - model.addAttribute("sexdstnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 + model.addAttribute("gender_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 model.addAttribute("grpId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 model.addAttribute("userSttusCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT013")); //사용자상태코드 목록 model.addAttribute("nsttCd_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 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 ad3f6d83..9b72d9ec 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 @@ -30,7 +30,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String password; //비밀번호 protected String password2; //비밀번호 protected String emplNo; //사원 번호 - protected String sexdstnCode; //성별 코드 + protected String gender; //성별 코드 protected String brthdy; //생일 protected String fxnum; //팩스번호 protected String addr; //주택 주소 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 fad83c2c..ac7c6e9d 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 @@ -131,7 +131,7 @@ public class XitUserRegMngVO extends BaseVO { /** * 성별코드 */ - private String sexdstnCode; + private String gender; /** * 우편번호 */ 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 f1fa1c20..9dc9075a 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 @@ -2070,7 +2070,7 @@ ,ORG_ID ,GRP_ID ,EMPL_NO - ,SEXDSTN_CODE + ,GENDER ,BRTHDY ,FXNUM ,ADDR @@ -2090,7 +2090,7 @@ AND ORG_ID = #{org_id } AND GRP_ID = #{grp_id } AND EMPL_NO = #{empl_no } - AND SEXDSTN_CODE = #{sexdstn_code } + AND GENDER = #{gender } AND BRTHDY = #{brthdy } AND FXNUM = #{fxnum } AND ADDR = #{addr } @@ -2112,7 +2112,7 @@ ,ORG_ID ,GRP_ID ,EMPL_NO - ,SEXDSTN_CODE + ,GENDER ,BRTHDY ,FXNUM ,ADDR @@ -2139,7 +2139,7 @@ ,ORG_ID ,GRP_ID ,EMPL_NO - ,SEXDSTN_CODE + ,GENDER ,BRTHDY ,FXNUM ,ADDR @@ -2158,7 +2158,7 @@ ,#{org_id } ,#{grp_id } ,#{empl_no } - ,#{sexdstn_code } + ,#{gender } ,#{brthdy } ,#{fxnum } ,#{addr } @@ -2182,7 +2182,7 @@ ,ORG_ID = #{org_id } ,GRP_ID = #{grp_id } ,EMPL_NO = #{empl_no } - ,SEXDSTN_CODE = #{sexdstn_code } + ,GENDER = #{gender } ,BRTHDY = #{brthdy } ,FXNUM = #{fxnum } ,ADDR = #{addr } @@ -2226,7 +2226,7 @@ ,USER_NM ,PASSWORD ,EMPL_NO - ,SEXDSTN_CODE + ,GENDER ,BRTHDY ,FXNUM ,ADDR @@ -2252,7 +2252,7 @@ AND USER_NM = #{user_nm } AND PASSWORD = #{password } AND EMPL_NO = #{empl_no } - AND SEXDSTN_CODE = #{sexdstn_code } + AND GENDER = #{gender } AND BRTHDY = #{brthdy } AND FXNUM = #{fxnum } AND ADDR = #{addr } @@ -2279,7 +2279,7 @@ ,USER_NM ,PASSWORD ,EMPL_NO - ,SEXDSTN_CODE + ,GENDER ,BRTHDY ,FXNUM ,ADDR @@ -2312,7 +2312,7 @@ , user_nm , password , empl_no - , sexdstn_code + , gender , brthdy , fxnum , addr @@ -2337,7 +2337,7 @@ , #{userNm} , #{password} , #{emplNo} - , #{sexdstnCode} + , #{gender} , #{brthdy} , #{fxnum} , #{addr} @@ -2368,7 +2368,7 @@ ,USER_NM = #{user_nm } ,PASSWORD = #{password } ,EMPL_NO = #{empl_no } - ,SEXDSTN_CODE = #{sexdstn_code } + ,GENDER = #{gender } ,BRTHDY = #{brthdy } ,FXNUM = #{fxnum } ,ADDR = #{addr } @@ -2404,7 +2404,7 @@ ,A.USER_NM ,A.PASSWORD ,A.EMPL_NO - ,A.SEXDSTN_CODE + ,A.GENDER ,A.BRTHDY ,A.FXNUM ,A.ADDR @@ -2435,7 +2435,7 @@ AND A.USER_NM = #{user_nm } AND A.PASSWORD = #{password } AND A.EMPL_NO = #{empl_no } - AND A.SEXDSTN_CODE = #{sexdstn_code } + AND A.GENDER = #{gender } AND A.BRTHDY = #{brthdy } AND A.FXNUM = #{fxnum } AND A.ADDR = #{addr } @@ -2466,7 +2466,7 @@ ,A.USER_NM ,A.PASSWORD ,A.EMPL_NO - ,A.SEXDSTN_CODE + ,A.GENDER ,A.BRTHDY ,A.FXNUM ,A.ADDR 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 95d3dae6..cef93df5 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 @@ -81,7 +81,7 @@ ,A.PASSWORD_HINT AS "passwordHint" ,A.PASSWORD_CNSR AS "passwordCnsr" ,A.EMPL_NO AS "emplNo" - ,A.SEXDSTN_CODE AS "sexdstnCode" + ,A.GENDER AS "gender" ,A.BRTHDY AS "brthdy" ,A.AREA_NO AS "areaNo" ,A.FXNUM AS "fxnum" 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 d2b035a9..c79f5a17 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 @@ -46,7 +46,7 @@ , password_hint , password_cnsr , empl_no - , sexdstn_code + , gender , brthdy , area_no , fxnum @@ -76,7 +76,7 @@ , user_nm , password , empl_no - , sexdstn_code + , gender , brthdy , fxnum , addr @@ -101,7 +101,7 @@ , #{userNm} , #{password} , #{emplNo} - , #{sexdstnCode} + , #{gender} , #{brthdy} , #{fxnum} , #{addr} @@ -130,7 +130,7 @@ org_id = IF(org_id = #{orgId}, org_id, #{orgId}) , user_nm = IF(user_nm = #{userNm}, user_nm, #{userNm}) , empl_no = IF(empl_no = #{emplNo}, empl_no, #{emplNo}) - , sexdstn_code = IF(sexdstn_code = #{sexdstnCode}, sexdstn_code, #{sexdstnCode}) + , gender = IF(gender = #{gender}, gender, #{gender}) , brthdy = IF(brthdy = #{brthdy}, brthdy, #{brthdy}) , fxnum = IF(fxnum = #{fxnum}, fxnum, #{fxnum}) , zip = IF(zip = #{zip}, zip, #{zip}) @@ -358,7 +358,7 @@ , org_id , grp_id , empl_no - , sexdstn_code + , gender , brthdy , fxnum , addr @@ -376,7 +376,7 @@ , org_id , grp_id , empl_no - , sexdstn_code + , gender , brthdy , fxnum , addr