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 80cc7970..bc3673ef 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 @@ -36,7 +36,7 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { protected String eml_adrs; //이메일 주소 protected String nstt_cd; //소속기관 코드 - protected String user_sttus_code; //사용자 상태 코드 + protected String stts; //사용자 상태 코드 protected String esntl_id; //고유 id public String getUser_id() { @@ -138,11 +138,11 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { public void setNstt_cd(String nstt_cd) { this.nstt_cd = nstt_cd; } - public String getUser_sttus_code() { - return user_sttus_code; + public String getStts() { + return stts; } - public void setUser_sttus_code(String user_sttus_code) { - this.user_sttus_code = user_sttus_code; + public void setStts(String stts) { + this.stts = stts; } public String getEsntl_id() { return esntl_id; diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java index 2f525c0e..63389bb5 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java @@ -93,7 +93,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF userUsrVO = xitFrameCrudService.findXitUserInfo(userUsrVO); // "회원가입승인" 상태인지 확인 - if (XitCmmnUtil.notEmpty(userUsrVO) && "P".equals(userUsrVO.getUserSttusCode())) { + if (XitCmmnUtil.notEmpty(userUsrVO) && "P".equals(userUsrVO.getStts())) { // XitLoginVO에 매핑 loginVO = new XitLoginVO(); loginVO.convertToLoginVO(userUsrVO); 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 fde6a05d..a2a3a044 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 @@ -145,7 +145,7 @@ public class XitFrameAnonymousController extends AbstractController { // model.addAttribute("entrprsSeCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT026")); //기업구분코드 목록 // model.addAttribute("indutyCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT027")); //업종코드 목록 // //업무사용자 -// model.addAttribute("userSttusCode_result" , userSttus_result); //사용자상태코드 목록 +// model.addAttribute("stts_result" , userSttus_result); //사용자상태코드 목록 // model.addAttribute("nsttCd_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 // model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 break; @@ -184,7 +184,7 @@ public class XitFrameAnonymousController extends AbstractController { model.addAttribute("passwdHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 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("stts_result" , xitFrameCodeService.findCmmnDetailCodes("XIT013")); //사용자상태코드 목록 model.addAttribute("nsttCd_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 break; @@ -262,7 +262,7 @@ public class XitFrameAnonymousController extends AbstractController { /** * 필수값 설정 */ - userManageVO.setUserSttusCode(this.getUserSttusCode(constUserSe)); //사용자상태코드(A: 신청, D: 삭제, P:승인) + userManageVO.setStts(this.getStts(constUserSe)); //사용자상태코드(A: 신청, D: 삭제, P:승인) /** * 처리 @@ -325,7 +325,7 @@ public class XitFrameAnonymousController extends AbstractController { * @author: 박민규 * @date: 2020. 11. 26. */ - private String getUserSttusCode(USER_SE userSe) { + private String getStts(USER_SE userSe) { String sttusCode = MEMBER_STATUS; if(!XitCmmnUtil.isEmpty(userSe)) { switch (userSe) { 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 bf636079..3f9ff13d 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 @@ -45,7 +45,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String posNm; //직위 명 protected String grpId; //그룹 id - 업무그룹(sgg_cd) protected String nsttCd; //소속기관 코드 - 시스템코드(sysSeCd) - protected String userSttusCode; //사용자 상태 코드 + protected String stts; //사용자 상태 코드 protected String esntlId; //고유 id protected String crtfcDn; //인증 dn 값 protected String regDt; //가입 일 @@ -55,5 +55,5 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String orgnztNm; protected String uniqId; protected String userTy; - protected String userSttusCodeNm; + protected String sttsNm; } 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 cce803bb..86c8be1f 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 @@ -71,7 +71,7 @@ public class XitUserRegMngVO extends BaseVO { /** * 사용자 상태 */ - private String userSttusCode; + private String stts; /** * 팩스번호 */ 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 fd93010b..1aba78f6 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 @@ -2081,7 +2081,7 @@ ,MBL_TELNO ,EML_ADRS ,NSTT_CD - ,USER_STTUS_CODE + ,STTS ,ESNTL_ID FROM XIT_USER_INFO_CHANGE_DTLS WHERE 1=1 @@ -2101,7 +2101,7 @@ AND MBL_TELNO = #{mblTelno } AND EML_ADRS = #{eml_adrs } AND NSTT_CD = #{nstt_cd } - AND USER_STTUS_CODE = #{user_sttus_code } + AND STTS = #{stts } AND ESNTL_ID = #{esntl_id } @@ -2294,7 +2294,7 @@ ,POS_NM ,GRP_ID ,NSTT_CD - ,USER_STTUS_CODE + ,STTS ,ESNTL_ID ,CRTFC_DN ,REG_DT @@ -2327,7 +2327,7 @@ , pos_nm , grp_id , nstt_cd - , user_sttus_code + , stts , esntl_id , crtfc_dn , REG_DT @@ -2352,7 +2352,7 @@ , #{posNm} , #{grpId} , #{nsttCd} - , #{userSttusCode} + , #{stts} , #{esntlId} , #{crtfcDn} , NOW() @@ -2383,7 +2383,7 @@ ,POS_NM = #{pos_nm } ,GRP_ID = #{grp_id } ,NSTT_CD = #{nstt_cd } - ,USER_STTUS_CODE = #{user_sttus_code } + ,STTS = #{stts } ,ESNTL_ID = #{esntl_id } ,CRTFC_DN = #{crtfc_dn } WHERE 1=1 @@ -2419,7 +2419,7 @@ ,A.POS_NM ,A.GRP_ID ,A.NSTT_CD - ,A.USER_STTUS_CODE + ,A.STTS ,A.ESNTL_ID ,A.CRTFC_DN ,A.REG_DT @@ -2450,7 +2450,7 @@ AND A.POS_NM = #{pos_nm } AND A.GRP_ID = #{grp_id } AND A.NSTT_CD = #{nstt_cd } - AND A.USER_STTUS_CODE = #{user_sttus_code } + AND A.STTS = #{stts } AND A.ESNTL_ID = #{esntl_id } AND A.CRTFC_DN = #{crtfc_dn } AND B.JOB_DATA_AUTHOR = #{job_data_author } @@ -2481,7 +2481,7 @@ ,A.POS_NM ,A.GRP_ID ,A.NSTT_CD - ,A.USER_STTUS_CODE + ,A.STTS ,A.ESNTL_ID ,A.CRTFC_DN ,A.REG_DT 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 eff0a642..4f1dbfe6 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 @@ -95,7 +95,7 @@ ,A.GRP_ID AS "grpId" ,A.ORG_ID AS "orgId" ,A.NSTT_CD AS "nsttCd" - ,A.USER_STTUS_CODE AS "userSttusCode" + ,A.STTS AS "stts" ,A.REG_DT AS "regDt" ,A.CRTFC_DN AS "crtfcDn" ,B.JOB_DATA_AUTHOR AS "jobDataAuthor" 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 91758b82..5a9a613c 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 @@ -15,16 +15,16 @@ , xui.area_no , xui.mbl_telno , xui.grp_id - , xui.user_sttus_code + , xui.stts , xui.REG_DT - , cdc.code_val AS userSttusCodeNm + , cdc.code_val AS sttsNm FROM xit_user_info xui LEFT OUTER JOIN tb_cmn_code cdc ON cdc.grp_id = 'XIT013' - AND xui.user_sttus_code = cdc.code + AND xui.stts = cdc.code - AND xui.user_sttus_code = #{sbscrbSttus} + AND xui.stts = #{sbscrbSttus} AND INSTR(xui.user_id, #{userId}) > 0 @@ -60,7 +60,7 @@ , grp_id , org_id , nstt_cd - , user_sttus_code + , stts , REG_DT , crtfc_dn FROM xit_user_info @@ -91,7 +91,7 @@ , pos_nm , grp_id , nstt_cd - , user_sttus_code + , stts , esntl_id , crtfc_dn , REG_DT @@ -116,7 +116,7 @@ , #{posNm} , #{grpId} , #{nsttCd} - , #{userSttusCode} + , #{stts} , #{esntlId} , #{crtfcDn} , NOW() @@ -143,7 +143,7 @@ , pos_nm = IF(pos_nm = #{posNm}, pos_nm, #{posNm}) , grp_id = IF(grp_id = #{grpId}, grp_id, #{grpId}) , nstt_cd = IF(nstt_cd = #{nsttCd}, nstt_cd, #{nsttCd}) - , user_sttus_code = IF(user_sttus_code = #{userSttusCode}, user_sttus_code, #{userSttusCode}) + , stts = IF(stts = #{stts}, stts, #{stts}) , crtfc_dn = IF(crtfc_dn = #{crtfcDn}, crtfc_dn, #{crtfcDn}) WHERE user_id = #{userId} @@ -369,7 +369,7 @@ , mbl_telno , eml_adrs , nstt_cd - , user_sttus_code + , stts , esntl_id ) SELECT user_id , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') @@ -387,7 +387,7 @@ , mbl_telno , eml_adrs , nstt_cd - , user_sttus_code + , stts , esntl_id FROM xit_user_info WHERE user_id = #{userId} diff --git a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml index 47d472df..4c0805a9 100644 --- a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml +++ b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml @@ -102,7 +102,7 @@ - + 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 354f2f23..6c659727 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 @@ -233,11 +233,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 a6c29e18..2b36cd92 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 @@ -181,11 +181,11 @@ - + - + - + 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 f7bee25b..ec68454d 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 @@ -198,8 +198,8 @@ function fnViewCheck(){ )- - - + + 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 9beace5c..fea78ee4 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 @@ -293,11 +293,11 @@ table { - + - + - + 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 d16cf974..ab4ad23c 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 @@ -241,7 +241,7 @@ }, { header: '가입상태', - name: 'userSttusCodeNm', + name: 'sttsNm', width: 110, sortable: false, align: 'center' 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 9a186e81..8ff7d1ca 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 @@ -176,8 +176,8 @@ - - + +