diff --git a/db/sql/외부연계.sql b/db/sql/외부연계.sql index 4314cfb1..b34178ce 100644 --- a/db/sql/외부연계.sql +++ b/db/sql/외부연계.sql @@ -119,7 +119,7 @@ select * from XIT_ORGNZT_INFO; AND ORGNZT_ID = 'BPV'; -select * from xit_cmmn_code where CODE_ID_NM like '%과태료%'; +select * from xit_cmmn_code where GRP_NM like '%과태료%'; UPDATE tb_ec_ctzn_sttemnt diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitCmmnCodeVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitCmmnCodeVO.java index 44a76a77..f7e0cc6b 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitCmmnCodeVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitCmmnCodeVO.java @@ -20,7 +20,7 @@ public class XitCmmnCodeVO extends BaseVO { private static final long serialVersionUID = -5850726883706732980L; protected String grp_id; //코드 id - protected String code_id_nm; //코드 id 명 + protected String grp_nm; //코드 id 명 protected String code_id_dc; //코드 id 설명 protected String use_at; //사용 여부 protected String cl_code; //분류 코드 @@ -36,11 +36,11 @@ public class XitCmmnCodeVO extends BaseVO { public void setGrp_id(String grp_id) { this.grp_id = grp_id; } - public String getCode_id_nm() { - return code_id_nm; + public String getGrp_nm() { + return grp_nm; } - public void setCode_id_nm(String code_id_nm) { - this.code_id_nm = code_id_nm; + public void setGrp_nm(String grp_nm) { + this.grp_nm = grp_nm; } public String getCode_id_dc() { return code_id_dc; diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/code/XitCmmnCodeMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/code/XitCmmnCodeMngVO.java index fbf376fe..3cf2fcdc 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/code/XitCmmnCodeMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/code/XitCmmnCodeMngVO.java @@ -34,7 +34,7 @@ public class XitCmmnCodeMngVO { /* * 코드ID명 */ - private String codeIdNm; + private String grpNm; /* * 코드ID설명 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/code/XitDetailCodeMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/code/XitDetailCodeMngVO.java index 950e9375..dc81eb40 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/code/XitDetailCodeMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/code/XitDetailCodeMngVO.java @@ -37,7 +37,7 @@ public class XitDetailCodeMngVO { * 코드ID명 */ @ApiParam(value = "코드 ID 이름") - private String codeIdNm; + private String grpNm; /* * 코드 diff --git a/src/main/java/kr/xit/fims/framework/core/XitCodeVO.java b/src/main/java/kr/xit/fims/framework/core/XitCodeVO.java index 25a8dd07..7a7b770e 100644 --- a/src/main/java/kr/xit/fims/framework/core/XitCodeVO.java +++ b/src/main/java/kr/xit/fims/framework/core/XitCodeVO.java @@ -16,7 +16,7 @@ public class XitCodeVO extends BaseVO { /** 코드ID */ private String grpId; /** 코드ID명 */ - private String codeIdNm; + private String grpNm; /** 코드 */ private String code; /** 코드명 */ @@ -47,11 +47,11 @@ public class XitCodeVO extends BaseVO { public void setGrpId(String grpId) { this.grpId = grpId; } - public String getCodeIdNm() { - return codeIdNm; + public String getGrpNm() { + return grpNm; } - public void setCodeIdNm(String codeIdNm) { - this.codeIdNm = codeIdNm; + public void setGrpNm(String grpNm) { + this.grpNm = grpNm; } public String getCode() { return code; diff --git a/src/main/resources/sql/mapper/framework/cache/cachecode-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cache/cachecode-mysql-mapper.xml index 43d7b455..8a2ed1b5 100644 --- a/src/main/resources/sql/mapper/framework/cache/cachecode-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cache/cachecode-mysql-mapper.xml @@ -62,7 +62,7 @@ /* 공통 코드 그룹 */ SELECT grp_id AS code - , code_id_nm AS code_val + , grp_nm AS code_val FROM xit_cmmn_code WHERE cl_code = #{grpId} AND use_at = 'Y' diff --git a/src/main/resources/sql/mapper/framework/cmm/XitFrameCode-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitFrameCode-mysql-mapper.xml index efa78b97..d6a87f2f 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitFrameCode-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitFrameCode-mysql-mapper.xml @@ -22,7 +22,7 @@ /** findCmmnCodes */ /** 공통코드 목록 조회 */ SELECT GRP_ID AS "grpId" - , CODE_ID_NM AS "codeIdNm" + , GRP_NM AS "grpNm" , CODE_ID_DC AS "codeIdDc" , CL_CODE AS "clCode" FROM XIT_CMMN_CODE 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 3df0c156..9afdd0bf 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 @@ -741,7 +741,7 @@ /** findXitCmmnCodes */ /** 공통코드 다건 조회 */ SELECT GRP_ID - ,CODE_ID_NM + ,GRP_NM ,CODE_ID_DC ,USE_AT ,CL_CODE @@ -751,8 +751,8 @@ ,LAST_UPDUSR_ID FROM XIT_CMMN_CODE WHERE 1=1 - AND GRP_ID = #{grp_id } - AND CODE_ID_NM = #{code_id_nm } + AND GRP_ID = #{grp_id } + AND GRP_NM = #{grp_nm } AND CODE_ID_DC = #{code_id_dc } AND USE_AT = #{use_at } AND CL_CODE = #{cl_code } @@ -765,7 +765,7 @@ /** findXitCmmnCode */ /** 공통코드 조회 */ SELECT GRP_ID - ,CODE_ID_NM + ,GRP_NM ,CODE_ID_DC ,USE_AT ,CL_CODE @@ -782,7 +782,7 @@ /** 공통코드 등록 */ INSERT INTO XIT_CMMN_CODE( GRP_ID - ,CODE_ID_NM + ,GRP_NM ,CODE_ID_DC ,USE_AT ,CL_CODE @@ -792,7 +792,7 @@ ,LAST_UPDUSR_ID )VALUES( #{grp_id } - ,#{code_id_nm } + ,#{grp_nm } ,#{code_id_dc } ,#{use_at } ,#{cl_code } @@ -808,7 +808,7 @@ UPDATE XIT_CMMN_CODE SET LAST_UPDT_PNTTM = NOW() - ,CODE_ID_NM = #{code_id_nm } + ,GRP_NM = #{grp_nm } ,CODE_ID_DC = #{code_id_dc } ,USE_AT = #{use_at } ,CL_CODE = #{cl_code } diff --git a/src/main/resources/sql/mapper/framework/cmm/cmm-ansTmpl-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/cmm-ansTmpl-mysql-mapper.xml index c04d2260..0f036358 100644 --- a/src/main/resources/sql/mapper/framework/cmm/cmm-ansTmpl-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/cmm-ansTmpl-mysql-mapper.xml @@ -19,7 +19,7 @@ , tcat.change_dt , tcat.changer , tcatd.answer_se_code - , cdc.code_id_nm AS answerSeCodeNm + , cdc.grp_nm AS answerSeCodeNm , tcatd.resn_code , cdc.code_val AS resnCodeNm , tcatd.answer_cn @@ -31,7 +31,7 @@ LEFT OUTER JOIN ( SELECT xcc.grp_id - , xcc.code_id_nm + , xcc.grp_nm , xcdc.code , xcdc.code_val FROM xit_cmmn_code xcc diff --git a/src/main/resources/sql/mapper/framework/mng/code/code-dtl-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/code/code-dtl-mysql-mapper.xml index 815aa9b7..4f4698b8 100644 --- a/src/main/resources/sql/mapper/framework/mng/code/code-dtl-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/code/code-dtl-mysql-mapper.xml @@ -8,7 +8,7 @@ ************************************************************************************************************** --> SELECT cdc.grp_id - , xcc.code_id_nm + , xcc.grp_nm , cdc.code , cdc.code_val , cdc.code_dc @@ -31,8 +31,8 @@ AND INSTR(cdc.grp_id, #{grpId}) > 0 - - AND INSTR(xcc.code_id_nm, #{codeIdNm}) > 0 + + AND INSTR(xcc.grp_nm, #{grpNm}) > 0 AND INSTR(cdc.code, #{code}) > 0 @@ -89,7 +89,7 @@ /* code-dtl-mysql-mapper|updateCmmnDtlCode-코드 정보 변경|julim */ UPDATE xit_cmmn_detail_code - SET code_val = IF(code_val = #{codeIdNm}, code_val, #{codeVal}) + SET code_val = IF(code_val = #{grpNm}, code_val, #{codeVal}) , code_dc = IF(code_dc = #{codeDc}, code_dc, #{codeDc}) , etc_1 = IF(etc_1 = #{etc1}, etc_1, #{etc1}) , etc_2 = IF(etc_2 = #{etc2}, etc_2, #{etc2}) diff --git a/src/main/resources/sql/mapper/framework/mng/code/code-grp-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/code/code-grp-mysql-mapper.xml index 723adba1..298e3f28 100644 --- a/src/main/resources/sql/mapper/framework/mng/code/code-grp-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/code/code-grp-mysql-mapper.xml @@ -10,7 +10,7 @@ SELECT xcc.cl_code , xccc.cl_code_nm , xcc.grp_id - , xcc.code_id_nm + , xcc.grp_nm , xcc.code_id_dc , xcc.use_at , xcc.frst_regist_pnttm @@ -27,8 +27,8 @@ AND INSTR(xcc.grp_id, #{grpId}) > 0 - - AND INSTR(xcc.code_id_nm, #{codeIdNm}) > 0 + + AND INSTR(xcc.grp_nm, #{grpNm}) > 0 AND xcc.use_at = #{useAt} @@ -53,7 +53,7 @@ INTO xit_cmmn_code ( cl_code , grp_id - , code_id_nm + , grp_nm , code_id_dc , use_at , frst_regist_pnttm @@ -61,7 +61,7 @@ ) VALUE ( #{clCode} , #{grpId} - , #{codeIdNm} + , #{grpNm} , #{codeIdDc} , #{useAt} , NOW() @@ -72,7 +72,7 @@ /* code-grp-mysql-mapper|updateCmmnGrpCode-코드그룹 정보 변경|julim */ UPDATE xit_cmmn_code - SET code_id_nm = IF(code_id_nm = #{codeIdNm}, code_id_nm, #{codeIdNm}) + SET grp_nm = IF(grp_nm = #{grpNm}, grp_nm, #{grpNm}) , code_id_dc = IF(code_id_dc = #{codeIdDc}, code_id_dc, #{codeIdDc}) , use_at = IF(use_at = #{useAt}, use_at, #{useAt}) , last_updt_pnttm = NOW() diff --git a/src/main/resources/validator/framework/mng/code/XitCmmnCodeMng.xml b/src/main/resources/validator/framework/mng/code/XitCmmnCodeMng.xml index 4a0fd5d3..141842fc 100644 --- a/src/main/resources/validator/framework/mng/code/XitCmmnCodeMng.xml +++ b/src/main/resources/validator/framework/mng/code/XitCmmnCodeMng.xml @@ -15,7 +15,7 @@ 6 - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_edit.jsp index a47a399e..7570e0b4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_edit.jsp @@ -48,11 +48,11 @@ - + - - + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_input.jsp index a69657e8..fda2d460 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_input.jsp @@ -51,11 +51,11 @@ - + - - + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list.jsp index c7e7476d..4034c3f7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list.jsp @@ -249,7 +249,7 @@ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵 }, { header: '코드ID명', - name: 'codeIdNm', + name: 'grpNm', width: 200, sortable: false, align: 'center' diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list2.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list2.jsp index 105471d9..ea6d38b8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list2.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list2.jsp @@ -131,7 +131,7 @@ function fnDelete(){ ${resultInfo.clCodeNm} ${resultInfo.grpId} - ${resultInfo.codeIdNm} + ${resultInfo.grpNm} 사용미사용 diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_edit.jsp index c11081a6..4d12837c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_edit.jsp @@ -36,7 +36,7 @@ - ${cmmnDetailCode.codeIdNm} + ${cmmnDetailCode.grpNm} @@ -285,7 +285,7 @@ var XitDetailCodeMng_edit = { success : function(data) { $('#grpId').children('option').remove(); $(data.cmmnCodeList).each(function(index, item){ - var option = $(''); + var option = $(''); $('#grpId').append(option); }); }, diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_input.jsp index a5636e32..d3a0b650 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_input.jsp @@ -42,7 +42,7 @@ @@ -292,7 +292,7 @@ var XitDetailCodeMng_input = { success : function(data) { $('#grpId').children('option').remove(); $(data.cmmnCodeList).each(function(index, item){ - var option = $(''); + var option = $(''); $('#grpId').append(option); }); }, diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_list.jsp index 254c1204..2f44bbc9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_list.jsp @@ -246,7 +246,7 @@ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵 }, { header: '코드ID명', - name: 'codeIdNm', + name: 'grpNm', width: 200, sortable: true, sortingType: 'desc', @@ -257,7 +257,7 @@ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵 formatter : function(props){ var rowData = props.grid.getRow(props.rowKey); var obj = { - formatter : rowData.codeIdNm + formatter : rowData.grpNm ,element : "text" } return obj; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp index cb083ee8..ecdb5680 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp @@ -63,7 +63,7 @@ infoSize:"xl", urls : { load : '', - getInfo : + getInfo : '' }, keymapper:info => info ? info.SOME_KEY : "", dataGetter:obj => obj.data.contents diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp index 706a01f2..846ad070 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp @@ -25,8 +25,8 @@ - - + + @@ -191,7 +191,7 @@ }, { header: '코드그룹명', - name: 'codeIdNm', + name: 'grpNm', width: 150, sortable: true, sortingType: 'desc', @@ -202,7 +202,7 @@ formatter : (props)=>{ const rowData = props.grid.getRow(props.rowKey); return { - formatter: rowData.codeIdNm + formatter: rowData.grpNm ,element: "text" } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp index 9daae65b..abadee55 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp @@ -40,8 +40,8 @@ - - + + @@ -167,7 +167,7 @@ ,success: (data) => { $('#grpId').children('option').remove(); $(data.comboList).each( (index, item) => { - //var option = $(''); + //var option = $(''); $('#grpId').append($('')); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp index 82db54ae..9835b13b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp @@ -25,8 +25,8 @@ - - + + - - + + @@ -201,7 +201,7 @@ Date Author Description // grid click event { header: '코드그룹명', - name: 'codeIdNm', + name: 'grpNm', width: 150, sortable: true, sortingType: 'desc', @@ -212,7 +212,7 @@ Date Author Description formatter : (props)=>{ const rowData = props.grid.getRow(props.rowKey); return { - formatter: rowData.codeIdNm + formatter: rowData.grpNm ,element: "text" } }