diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitEntrprsMberVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitEntrprsMberVO.java index 7c5ec375..7ffbdc99 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitEntrprsMberVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitEntrprsMberVO.java @@ -39,7 +39,7 @@ public class XitEntrprsMberVO extends BaseVO { protected String induty_code; //업종 코드 protected String applcntNm; //신청인 명 protected String applcntIhidnum; //신청인 주민등록번호 - protected String sbscrbDe; //가입 일 + protected String regDt; //가입 일 protected String entrprsMberSttus; //기업 회원 상태 protected String entrprsMberPassword; //기업 회원 비밀번호 protected String entrprsMberPasswordHint; //기업 회원 비밀번호 힌트 diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitGnrlMberVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitGnrlMberVO.java index b33c0dc6..9d8943e3 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitGnrlMberVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitGnrlMberVO.java @@ -43,7 +43,8 @@ public class XitGnrlMberVO extends BaseVO { protected String mberFxnum; //회원 팩스번호 protected String mberEmailAdres; //회원 이메일 주소 protected String middleTelno; //중간 전화번호 - protected String sbscrbDe; //가입 일자 + protected String regDt; //가입 일자 + protected String sexdstnCode; //성별 코드 protected String esntlId; //고유 id } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitEntUserRegMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitEntUserRegMngVO.java index 622b402e..9a148a78 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitEntUserRegMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitEntUserRegMngVO.java @@ -112,7 +112,7 @@ public class XitEntUserRegMngVO extends BaseVO { /** * 가입 일자 */ - private String sbscrbDe; + private String regDt; /** * 우편번호 */ @@ -469,18 +469,18 @@ public class XitEntUserRegMngVO extends BaseVO { this.entrprsMiddleTelno = entrprsMiddleTelno; } /** - * sbscrbDe attribute 값을 리턴한다. + * regDt attribute 값을 리턴한다. * @return String */ - public String getSbscrbDe() { - return sbscrbDe; + public String getRegDt() { + return regDt; } /** - * sbscrbDe attribute 값을 설정한다. - * @param sbscrbDe String + * regDt attribute 값을 설정한다. + * @param regDt String */ - public void setSbscrbDe(String sbscrbDe) { - this.sbscrbDe = sbscrbDe; + public void setRegDt(String regDt) { + this.regDt = regDt; } /** * zip attribute 값을 리턴한다. diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitGnrUserRegMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitGnrUserRegMngVO.java index 34cad475..b8a43fed 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitGnrUserRegMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitGnrUserRegMngVO.java @@ -96,7 +96,7 @@ public class XitGnrUserRegMngVO extends BaseVO { /** * 가입 일자 */ - private String sbscrbDe; + private String regDt; /** * 우편번호 */ @@ -396,18 +396,18 @@ public class XitGnrUserRegMngVO extends BaseVO { this.passwordHint = passwordHint; } /** - * sbscrbDe attribute 값을 리턴한다. + * regDt attribute 값을 리턴한다. * @return String */ - public String getSbscrbDe() { - return sbscrbDe; + public String getRegDt() { + return regDt; } /** - * sbscrbDe attribute 값을 설정한다. - * @param sbscrbDe String + * regDt attribute 값을 설정한다. + * @param regDt String */ - public void setSbscrbDe(String sbscrbDe) { - this.sbscrbDe = sbscrbDe; + public void setRegDt(String regDt) { + this.regDt = regDt; } /** * zip attribute 값을 리턴한다. 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 38aa0396..286ac7ed 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 @@ -51,7 +51,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String userSttusCode; //사용자 상태 코드 protected String esntlId; //고유 id protected String crtfcDnValue; //인증 dn 값 - protected String sbscrbDe; //가입 일 + protected String regDt; //가입 일 protected String emplyrId; protected String emplyrNm; 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 7a540ce1..94de2e9c 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 @@ -31,7 +31,7 @@ public class XitUserRegMngVO extends BaseVO { /** * 가입일 */ - private String sbscrbDe; + private String regDt; /** * 사용자고유아이디 */ diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitEntUserRegMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitEntUserRegMngServiceBean.java index 527dbfd1..ff570570 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitEntUserRegMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitEntUserRegMngServiceBean.java @@ -274,7 +274,7 @@ public class XitEntUserRegMngServiceBean extends AbstractServiceBean implements crudVO.setInduty_code (vo.getIndutyCode()); //업종 코드 crudVO.setApplcntNm(vo.getApplcntNm()); //신청인 명 crudVO.setApplcntIhidnum(vo.getApplcntIhidnum()); //신청인 주민등록번호 - crudVO.setSbscrbDe(vo.getSbscrbDe()); //가입 일 + crudVO.setRegDt(vo.getRegDt()); //가입 일 crudVO.setEntrprsMberSttus(vo.getEntrprsMberSttus()); //기업 회원 상태 crudVO.setEntrprsMberPassword(password); //기업 회원 비밀번호 crudVO.setEntrprsMberPasswordHint(vo.getEntrprsMberPasswordHint()); //기업 회원 비밀번호 힌트 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitGnrUserRegMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitGnrUserRegMngServiceBean.java index fcc98101..19dd3046 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitGnrUserRegMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/XitGnrUserRegMngServiceBean.java @@ -278,7 +278,7 @@ public class XitGnrUserRegMngServiceBean extends AbstractServiceBean implements crudVO.setMberFxnum(vo.getMberFxnum()); //회원 팩스번호 crudVO.setMberEmailAdres(vo.getMberEmailAdres()); //회원 이메일 주소 crudVO.setMiddleTelno(vo.getMiddleTelno()); //중간 전화번호 - crudVO.setSbscrbDe(vo.getSbscrbDe()); //가입 일자 + crudVO.setRegDt(vo.getRegDt()); //가입 일자 crudVO.setSexdstnCode(vo.getSexdstnCode()); //성별 코드 crudVO.setEsntlId(vo.getUniqId()); //고유 id 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 7f027ced..0a22df3d 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 @@ -1046,7 +1046,7 @@ ,INDUTY_CODE ,APPLCNT_NM ,APPLCNT_IHIDNUM - ,SBSCRB_DE + ,REG_DT ,ENTRPRS_MBER_STTUS ,ENTRPRS_MBER_PASSWORD ,ENTRPRS_MBER_PASSWORD_HINT @@ -1072,7 +1072,6 @@ AND INDUTY_CODE = #{induty_code } AND APPLCNT_NM = #{applcnt_nm } AND APPLCNT_IHIDNUM = #{applcnt_ihidnum } - AND SBSCRB_DE = #{sbscrb_de } AND ENTRPRS_MBER_STTUS = #{entrprs_mber_sttus } AND ENTRPRS_MBER_PASSWORD = #{entrprs_mber_password } AND ENTRPRS_MBER_PASSWORD_HINT = #{entrprs_mber_password_hint} @@ -1100,7 +1099,7 @@ ,INDUTY_CODE ,APPLCNT_NM ,APPLCNT_IHIDNUM - ,SBSCRB_DE + ,REG_DT ,ENTRPRS_MBER_STTUS ,ENTRPRS_MBER_PASSWORD ,ENTRPRS_MBER_PASSWORD_HINT @@ -1132,7 +1131,7 @@ ,INDUTY_CODE ,APPLCNT_NM ,APPLCNT_IHIDNUM - ,SBSCRB_DE + ,REG_DT ,ENTRPRS_MBER_STTUS ,ENTRPRS_MBER_PASSWORD ,ENTRPRS_MBER_PASSWORD_HINT @@ -1188,7 +1187,6 @@ ,INDUTY_CODE = #{induty_code } ,APPLCNT_NM = #{applcnt_nm } ,APPLCNT_IHIDNUM = #{applcnt_ihidnum } - ,SBSCRB_DE = #{sbscrb_de } ,ENTRPRS_MBER_STTUS = #{entrprs_mber_sttus } ,ENTRPRS_MBER_PASSWORD = #{entrprs_mber_password } ,ENTRPRS_MBER_PASSWORD_HINT = #{entrprs_mber_password_hint} @@ -1376,7 +1374,7 @@ ,MBER_FXNUM ,MBER_EMAIL_ADRES ,MIDDLE_TELNO - ,SBSCRB_DE + ,REG_DT ,SEXDSTN_CODE ,ESNTL_ID FROM XIT_GNRL_MBER @@ -1398,7 +1396,6 @@ AND MBER_FXNUM = #{mber_fxnum } AND MBER_EMAIL_ADRES = #{mber_email_adres} AND MIDDLE_TELNO = #{middle_telno } - AND SBSCRB_DE = #{sbscrb_de } AND SEXDSTN_CODE = #{sexdstn_code } AND ESNTL_ID = #{esntl_id } @@ -1422,7 +1419,7 @@ ,MBER_FXNUM ,MBER_EMAIL_ADRES ,MIDDLE_TELNO - ,SBSCRB_DE + ,REG_DT ,SEXDSTN_CODE ,ESNTL_ID FROM XIT_GNRL_MBER @@ -1450,7 +1447,7 @@ ,MBER_FXNUM ,MBER_EMAIL_ADRES ,MIDDLE_TELNO - ,SBSCRB_DE + ,REG_DT ,SEXDSTN_CODE ,ESNTL_ID )VALUES( @@ -1498,7 +1495,6 @@ ,MBER_FXNUM = #{mber_fxnum } ,MBER_EMAIL_ADRES = #{mber_email_adres} ,MIDDLE_TELNO = #{middle_telno } - ,SBSCRB_DE = #{sbscrb_de } ,SEXDSTN_CODE = #{sexdstn_code } WHERE 1=1 AND MBER_ID = #{mber_id} @@ -2599,7 +2595,7 @@ ,USER_STTUS_CODE ,ESNTL_ID ,CRTFC_DN_VALUE - ,SBSCRB_DE + ,REG_DT FROM XIT_USER_INFO WHERE 1=1 AND USER_ID = #{user_id } @@ -2628,7 +2624,6 @@ AND USER_STTUS_CODE = #{user_sttus_code } AND ESNTL_ID = #{esntl_id } AND CRTFC_DN_VALUE = #{crtfc_dn_value } - AND SBSCRB_DE = #{sbscrb_de } /** findXitUserInfo */ @@ -2659,7 +2654,7 @@ ,USER_STTUS_CODE ,ESNTL_ID ,CRTFC_DN_VALUE - ,SBSCRB_DE + ,REG_DT FROM XIT_USER_INFO WHERE 1=1 AND USER_ID = #{user_id} @@ -2695,7 +2690,7 @@ , user_sttus_code , esntl_id , crtfc_dn_value - , sbscrb_de + , REG_DT ) VALUES ( #{userId} , #{orgnztId} @@ -2731,7 +2726,7 @@ /** 사용자정보 수정 */ UPDATE XIT_USER_INFO SET - SBSCRB_DE = SBSCRB_DE + REG_DT = REG_DT ,ORGNZT_ID = #{orgnzt_id } ,USER_NM = #{user_nm } ,PASSWORD = #{password } @@ -2796,7 +2791,7 @@ ,A.USER_STTUS_CODE ,A.ESNTL_ID ,A.CRTFC_DN_VALUE - ,A.SBSCRB_DE + ,A.REG_DT ,B.JOB_DATA_AUTHOR ,B.USER_MANAGE_AUTHOR ,B.ELCTRNSANCTN_USE_YN @@ -2830,7 +2825,6 @@ AND A.USER_STTUS_CODE = #{user_sttus_code } AND A.ESNTL_ID = #{esntl_id } AND A.CRTFC_DN_VALUE = #{crtfc_dn_value } - AND A.SBSCRB_DE = #{sbscrb_de } AND B.JOB_DATA_AUTHOR = #{job_data_author } AND B.USER_MANAGE_AUTHOR = #{user_manage_author } AND B.ELCTRNSANCTN_USE_YN= #{elctrnsanctn_use_yn} @@ -2865,7 +2859,7 @@ ,A.USER_STTUS_CODE ,A.ESNTL_ID ,A.CRTFC_DN_VALUE - ,A.SBSCRB_DE + ,A.REG_DT ,B.JOB_DATA_AUTHOR ,B.USER_MANAGE_AUTHOR ,B.ELCTRNSANCTN_USE_YN diff --git a/src/main/resources/sql/mapper/framework/mng/usr/XitEntUserRegMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/XitEntUserRegMng-mysql-mapper.xml index 81ab22b7..e699d5e9 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/XitEntUserRegMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/XitEntUserRegMng-mysql-mapper.xml @@ -25,7 +25,7 @@ ,'' AS "mbtlnum" ,A.GROUP_ID AS "groupId" ,A.ENTRPRS_MBER_STTUS AS "sttus" - ,A.SBSCRB_DE AS "sbscrbDe" + ,A.REG_DT AS "regDt" ,(SELECT CODE_VAL FROM tb_cmn_code WHERE USE_YN = 'Y' AND GRP_ID = 'XIT013' AND CODE = A.ENTRPRS_MBER_STTUS) AS "userSttusCode" @@ -98,7 +98,7 @@ ,A.FXNUM AS "fxnum" ,A.INDUTY_CODE AS "indutyCode" ,A.APPLCNT_NM AS "applcntNm" - ,A.SBSCRB_DE AS "sbscrbDe" + ,A.REG_DT AS "regDt" ,A.ENTRPRS_MBER_STTUS AS "entrprsMberSttus" ,A.ENTRPRS_MBER_PASSWORD AS "entrprsMberPassword" ,A.ENTRPRS_MBER_PASSWORD_HINT AS "entrprsMberPasswordHint" diff --git a/src/main/resources/sql/mapper/framework/mng/usr/XitGnrUserRegMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/XitGnrUserRegMng-mysql-mapper.xml index 6f84bf23..bf5f86d1 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/XitGnrUserRegMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/XitGnrUserRegMng-mysql-mapper.xml @@ -24,7 +24,7 @@ ,A.MBTLNUM AS "mbtlnum" ,A.GROUP_ID AS "groupId" ,A.MBER_STTUS AS "sttus" - ,A.SBSCRB_DE AS "sbscrbDe" + ,A.REG_DT AS "regDt" ,(SELECT CODE_VAL FROM tb_cmn_code WHERE USE_YN = 'Y' AND GRP_ID = 'XIT013' AND CODE = A.MBER_STTUS) AS "userSttusCode" @@ -104,7 +104,7 @@ ,A.MBER_FXNUM AS "mberFxnum" ,A.MBER_EMAIL_ADRES AS "mberEmailAdres" ,A.MIDDLE_TELNO AS "middleTelno" - ,A.SBSCRB_DE AS "sbscrbDe" + ,A.REG_DT AS "regDt" WHERE A.ESNTL_ID = #{uniqId} 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 7ce2f490..172a54e3 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 @@ -99,7 +99,7 @@ ,A.ORGNZT_ID AS "orgnztId" ,A.PSTINST_CODE AS "pstinstCode" ,A.USER_STTUS_CODE AS "userSttusCode" - ,A.SBSCRB_DE AS "sbscrbDe" + ,A.REG_DT AS "regDt" ,A.CRTFC_DN_VALUE AS "crtfcDnValue" ,B.JOB_DATA_AUTHOR AS "jobDataAuthor" ,B.USER_MANAGE_AUTHOR AS "userManageAuthor" 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 45b001d1..22754588 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 @@ -18,7 +18,7 @@ , xui.mbtlnum , xui.group_id , xui.user_sttus_code - , xui.sbscrb_de + , xui.REG_DT , cdc.code_val AS userSttusCodeNm FROM xit_user_info xui LEFT OUTER JOIN tb_cmn_code cdc @@ -35,7 +35,7 @@ AND INSTR(xui.user_nm, #{userNm}) > 0 - ORDER BY sbscrb_de DESC + ORDER BY REG_DT DESC @@ -66,7 +66,7 @@ , orgnzt_id , pstinst_code , user_sttus_code - , sbscrb_de + , REG_DT , crtfc_dn_value FROM xit_user_info WHERE esntl_id = #{uniqId} @@ -102,7 +102,7 @@ , user_sttus_code , esntl_id , crtfc_dn_value - , sbscrb_de + , REG_DT ) VALUES ( #{userId} , #{orgnztId} diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitEntUserRegMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitEntUserRegMng_list.jsp index 70402e25..720920b9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitEntUserRegMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitEntUserRegMng_list.jsp @@ -375,7 +375,7 @@ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵 }, { header: '등록일', - name: 'sbscrbDe', + name: 'regDt', width: 150, sortable: false, align: 'center' diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitGnrUserRegMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitGnrUserRegMng_list.jsp index 89aecc21..353e5e86 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitGnrUserRegMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitGnrUserRegMng_list.jsp @@ -368,7 +368,7 @@ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵 }, { header: '등록일', - name: 'sbscrbDe', + name: 'regDt', width: 150, sortable: false, align: 'center' diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_list2.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_list2.jsp index 6b61443e..077efc43 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_list2.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_list2.jsp @@ -196,7 +196,7 @@ function fnViewCheck(){ )- - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp index 69c74c74..2e3eb349 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp @@ -231,7 +231,7 @@ }, { header: '등록일시', - name: 'sbscrbDe', + name: 'regDt', width: 150, sortable: false, align: 'center',