xit-app
/
external-system-test
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor : 유저 테이블 변경

Browse Source
main
이범준 1 year ago
parent b147d863e5
commit 86523933fe
15 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java
Unescape Escape View File

@ -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;

2
src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java
Unescape Escape View File

@ -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);

8
src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java
Unescape Escape View File

@ -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) {

4
src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java
Unescape Escape View File

@ -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;
}

2
src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java
Unescape Escape View File

@ -71,7 +71,7 @@ public class XitUserRegMngVO extends BaseVO {
/**
* 사용자 상태
*/
private String userSttusCode;
private String stts;
/**
* 팩스번호
*/

30
src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml
Unescape Escape View File

@ -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 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(mblTelno )">AND MBL_TELNO = #{mblTelno }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(eml_adrs )">AND EML_ADRS = #{eml_adrs }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(nstt_cd )">AND NSTT_CD = #{nstt_cd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_sttus_code )">AND USER_STTUS_CODE = #{user_sttus_code }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(stts )">AND STTS = #{stts }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(esntl_id )">AND ESNTL_ID = #{esntl_id }</if>
</select>
<select id="findXitUserInfoChangeDtls" resultType="kr.xit.fims.framework.biz.cmm.XitUserInfoChangeDtlsVO">
@ -2123,7 +2123,7 @@
,MBL_TELNO
,EML_ADRS
,NSTT_CD
,USER_STTUS_CODE
,STTS
,ESNTL_ID
FROM XIT_USER_INFO_CHANGE_DTLS
WHERE 1=1
@ -2150,7 +2150,7 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(mblTelno )">,MBL_TELNO </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(eml_adrs )">,EML_ADRS </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(nstt_cd )">,NSTT_CD </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_sttus_code )">,USER_STTUS_CODE </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(stts )">,STTS </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(esntl_id )">,ESNTL_ID </if>
)VALUES(
#{user_id }
@ -2169,7 +2169,7 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(mblTelno )">,#{mblTelno }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(eml_adrs )">,#{eml_adrs }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(nstt_cd )">,#{nstt_cd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_sttus_code )">,#{user_sttus_code }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(stts )">,#{stts }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(esntl_id )">,#{esntl_id }</if>
)
</insert>
@ -2193,7 +2193,7 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(mblTelno )">,MBL_TELNO = #{mblTelno }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(eml_adrs )">,EML_ADRS = #{eml_adrs }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(nstt_cd )">,NSTT_CD = #{nstt_cd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(user_sttus_code )">,USER_STTUS_CODE = #{user_sttus_code }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(stts )">,STTS = #{stts }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(esntl_id )">,ESNTL_ID = #{esntl_id }</if>
WHERE 1=1
AND USER_ID = #{user_id }
@ -2241,7 +2241,7 @@
,POS_NM
,GRP_ID
,NSTT_CD
,USER_STTUS_CODE
,STTS
,ESNTL_ID
,CRTFC_DN
,REG_DT
@ -2267,7 +2267,7 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(pos_nm )">AND POS_NM = #{pos_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(grp_id )">AND GRP_ID = #{grp_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(nstt_cd )">AND NSTT_CD = #{nstt_cd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_sttus_code )">AND USER_STTUS_CODE = #{user_sttus_code }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(stts )">AND STTS = #{stts }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(esntl_id )">AND ESNTL_ID = #{esntl_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(crtfc_dn )">AND CRTFC_DN = #{crtfc_dn }</if>
</select>
@ -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 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(pos_nm )">,POS_NM = #{pos_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(grp_id )">,GRP_ID = #{grp_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(nstt_cd )">,NSTT_CD = #{nstt_cd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(user_sttus_code )">,USER_STTUS_CODE = #{user_sttus_code }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(stts )">,STTS = #{stts }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(esntl_id )">,ESNTL_ID = #{esntl_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(crtfc_dn )">,CRTFC_DN = #{crtfc_dn }</if>
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 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(pos_nm )">AND A.POS_NM = #{pos_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(grp_id )">AND A.GRP_ID = #{grp_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(nstt_cd )">AND A.NSTT_CD = #{nstt_cd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_sttus_code )">AND A.USER_STTUS_CODE = #{user_sttus_code }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(stts )">AND A.STTS = #{stts }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(esntl_id )">AND A.ESNTL_ID = #{esntl_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(crtfc_dn )">AND A.CRTFC_DN = #{crtfc_dn }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(job_data_author )">AND B.JOB_DATA_AUTHOR = #{job_data_author }</if>
@ -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

2
src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml
Unescape Escape View File

@ -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"

20
src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml
Unescape Escape View File

@ -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
<where>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(sbscrbSttus)">
AND xui.user_sttus_code = #{sbscrbSttus}
AND xui.stts = #{sbscrbSttus}
</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(userId)">
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})
</set>
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}

2
src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml
Unescape Escape View File

@ -102,7 +102,7 @@
<arg0 key="조직코드" resource="false"/>
</field>
<!-- <field property="userSttusCode" depends="required"> -->
<!-- <field property="stts" depends="required"> -->
<!-- <arg0 key="사용자상태코드" resource="false"/> -->
<!-- </field> -->

6
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp
Unescape Escape View File

@ -233,11 +233,11 @@ table {
<label class="required">사용자상태코드</label>
</th>
<td width="30%" >
<form:select path="userSttusCode" id="userSttusCode">
<form:select path="stts" id="stts">
<form:option value="" label="--선택하세요--"/>
<form:options items="${userSttusCode_result}" itemValue="code" itemLabel="codeVal"/>
<form:options items="${stts_result}" itemValue="code" itemLabel="codeVal"/>
</form:select>
<form:errors path="userSttusCode" cssClass="error"/>
<form:errors path="stts" cssClass="error"/>
</td>
<th width="20%" height="23">
<label class="required">권한그룹</label>

6
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp
Unescape Escape View File

@ -181,11 +181,11 @@
<label class="required">사용자상태코드</label>
</th>
<td>
<form:select path="userSttusCode" id="userSttusCode" title="사용자상태코드">
<form:select path="stts" id="stts" title="사용자상태코드">
<form:option value="" label="--선택하세요--" />
<form:options items="${userSttusCode_result}" itemValue="code" itemLabel="codeVal" />
<form:options items="${stts_result}" itemValue="code" itemLabel="codeVal" />
</form:select>
<form:errors path="userSttusCode" cssClass="error" />
<form:errors path="stts" cssClass="error" />
</td>
<th height="23">
<label class="required">그룹아이디</label>

4
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_list2.jsp
Unescape Escape View File

@ -198,8 +198,8 @@ function fnViewCheck(){
<td nowrap="nowrap"><c:out value="${result.areaNo}"/>)<c:out value="${result.middleTelno}"/>-<c:out value="${result.endTelno}"/></td>
<td nowrap="nowrap"><c:out value="${result.regDt}"/></td>
<td nowrap="nowrap">
<c:forEach var="userSttusCode_result" items="${userSttusCode_result}" varStatus="status">
<c:if test="${result.sttus == userSttusCode_result.code}"><c:out value="${userSttusCode_result.codeVal}"/></c:if>
<c:forEach var="stts_result" items="${stts_result}" varStatus="status">
<c:if test="${result.sttus == stts_result.code}"><c:out value="${stts_result.codeVal}"/></c:if>
</c:forEach>
</td>
</tr>

6
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp
Unescape Escape View File

@ -293,11 +293,11 @@ table {
<label class="required">사용자상태코드</label>
</th>
<td >
<form:select path="userSttusCode" id="userSttusCode">
<form:select path="stts" id="stts">
<form:option value="" label="--선택하세요--"/>
<form:options items="${userSttusCode_result}" itemValue="code" itemLabel="codeVal"/>
<form:options items="${stts_result}" itemValue="code" itemLabel="codeVal"/>
</form:select>
<form:errors path="userSttusCode" cssClass="error"/>
<form:errors path="stts" cssClass="error"/>
</td>
<th height="23">
<label class="required">권한그룹</label>

2
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp
Unescape Escape View File

@ -241,7 +241,7 @@
},
{
header: '가입상태',
name: 'userSttusCodeNm',
name: 'sttsNm',
width: 110,
sortable: false,
align: 'center'

4
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp
Unescape Escape View File

@ -176,8 +176,8 @@
<label>사용자 상태</label>
</th>
<td>
<code:select id="userSttusCode" name="userSttusCode" grpId="XIT013" defaultSelect="${!isUpdate? 'A': userInfoVO.userSttusCode}" disabled="${!isUpdate}" title="사용자상태" cls="form-select" alt="사용자상태"/>
<form:errors path="userSttusCode" cssClass="error" />
<code:select id="stts" name="stts" grpId="XIT013" defaultSelect="${!isUpdate? 'A': userInfoVO.stts}" disabled="${!isUpdate}" title="사용자상태" cls="form-select" alt="사용자상태"/>
<form:errors path="stts" cssClass="error" />
</td>
<th height="23">
<label class="required">그룹 아이디</label>

Write Preview
Loading…
Cancel
Save