From 9881653bae3cbb759072a92ebf324019ab28b4fa Mon Sep 17 00:00:00 2001 From: rsone001 Date: Fri, 16 Jan 2026 13:22:34 +0900 Subject: [PATCH] =?UTF-8?q?fix:=2012.=20=ED=95=98=EC=88=98=20=EB=B0=92=20?= =?UTF-8?q?=EB=B6=84=EB=87=A8=20=EA=B4=80=EB=A0=A8=20=EC=82=AC=EC=97=85=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=BC=EB=A7=A4=ED=95=91=EC=98=A4=EB=A5=98(?= =?UTF-8?q?=ED=95=9C=EA=B8=80=ED=99=94)=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../review/SewageExcretaRelatedRvwColumn.ts | 76 +++++-------------- 1 file changed, 19 insertions(+), 57 deletions(-) diff --git a/apps/st/src/components/util/column/review/SewageExcretaRelatedRvwColumn.ts b/apps/st/src/components/util/column/review/SewageExcretaRelatedRvwColumn.ts index c68c54d2a..be414d00f 100644 --- a/apps/st/src/components/util/column/review/SewageExcretaRelatedRvwColumn.ts +++ b/apps/st/src/components/util/column/review/SewageExcretaRelatedRvwColumn.ts @@ -8,17 +8,12 @@ const rawExcretaRelatedList = [ rowStartNum: 2, fixedColumns: 2, columns: [ - /* 1. 행정 및 조직 정보 */ { name: 'SIDO', fieldName: '시도', header: { text: '시도' } }, { name: 'GUGUN', fieldName: '시군구', header: { text: '시군구' } }, { name: 'OCGNZ', fieldName: '직제', header: { text: '직제' } }, { name: 'YR_GBN', fieldName: '구분', header: { text: '구분' } }, - - /* 2. 인력 총계 및 행정직 */ { name: 'TOT_WTR_QRM', fieldName: '직원총수', header: { text: '직원총수' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'ADMINIST_JSSFC', fieldName: '행정직', header: { text: '행정직' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, - - /* 3. 기술직 상세 (단위: 명) */ { name: 'TCHNLGY_JSSFC_SM', fieldName: '계(기술직)', header: { text: '계' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'ENGRK_JSSFC', fieldName: '토목', header: { text: '토목' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'MCHN_JSSFC', fieldName: '기계', header: { text: '기계' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, @@ -26,26 +21,18 @@ const rawExcretaRelatedList = [ { name: 'CHMSTRY_JSSFC', fieldName: '화공', header: { text: '화공' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'ENVRN_JSSFC', fieldName: '환경', header: { text: '환경' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'TCHNLGY_ETC', fieldName: '기타(기술직)', header: { text: '기타' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, - - /* 4. 기타 및 비고 */ { name: 'ETC', fieldName: '기타', header: { text: '기타' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'RMK', fieldName: '비고', header: { text: '비고' } }, ], columnLayout: [ - { name: 'addrGroup', header: { text: '행정구역' }, items: ['시도', '시군구'] }, - '직제', - '구분', - '직원총수', - '행정직', + { name: 'addrGroup', header: { text: '행정구역' }, items: ['SIDO', 'GUGUN'] }, + 'OCGNZ', 'YR_GBN', 'TOT_WTR_QRM', 'ADMINIST_JSSFC', { name: 'techJobGroup', header: { text: '기술직' }, - items: [ - '계(기술직)', '토목', '기계', '전기', '화공', '환경', '기타(기술직)' - ] + items: ['TCHNLGY_JSSFC_SM', 'ENGRK_JSSFC', 'MCHN_JSSFC', 'ELCTY_JSSFC', 'CHMSTRY_JSSFC', 'ENVRN_JSSFC', 'TCHNLGY_ETC'] }, - '기타', - '비고', + 'ETC', 'RMK' ] }, { @@ -54,17 +41,12 @@ const rawExcretaRelatedList = [ rowStartNum: 2, fixedColumns: 1, columns: [ - /* 1. 행정 및 조직 정보 */ { name: 'SIDO', fieldName: '시도', header: { text: '시도' } }, { name: 'GUGUN', fieldName: '시군구', header: { text: '시군구' } }, { name: 'OCGNZ', fieldName: '직제', header: { text: '직제' } }, { name: 'YR_GBN', fieldName: '구분', header: { text: '구분' } }, - - /* 2. 인력 총계 및 행정직 */ { name: 'TOT_WTR_QRM', fieldName: '직원총수', header: { text: '직원총수' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'ADMINIST_JSSFC', fieldName: '행정직', header: { text: '행정직' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, - - /* 3. 기술직 상세 (단위: 명) */ { name: 'TCHNLGY_JSSFC_SM', fieldName: '계(기술직)', header: { text: '계' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'ENGRK_JSSFC', fieldName: '토목', header: { text: '토목' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'MCHN_JSSFC', fieldName: '기계', header: { text: '기계' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, @@ -72,22 +54,18 @@ const rawExcretaRelatedList = [ { name: 'CHMSTRY_JSSFC', fieldName: '화공', header: { text: '화공' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'ENVRN_JSSFC', fieldName: '환경', header: { text: '환경' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'TCHNLGY_ETC', fieldName: '기타(기술직)', header: { text: '기타' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, - - /* 4. 기타 및 비고 */ { name: 'ETC', fieldName: '기타', header: { text: '기타' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'RMK', fieldName: '비고', header: { text: '비고' } }, ], columnLayout: [ - { name: 'addrGroup', header: { text: '행정구역' }, items: ['시도', '시군구'] }, - '직제', '구분', '직원총수', '행정직', + { name: 'addrGroup', header: { text: '행정구역' }, items: ['SIDO', 'GUGUN'] }, + 'OCGNZ', 'YR_GBN', 'TOT_WTR_QRM', 'ADMINIST_JSSFC', { name: 'techJobGroup', header: { text: '기술직' }, - items: [ - '계(기술직)', '토목', '기계', '전기', '화공', '환경', '기타(기술직)' - ] + items: ['TCHNLGY_JSSFC_SM', 'ENGRK_JSSFC', 'MCHN_JSSFC', 'ELCTY_JSSFC', 'CHMSTRY_JSSFC', 'ENVRN_JSSFC', 'TCHNLGY_ETC'] }, - '기타', '비고', + 'ETC', 'RMK' ] }, { @@ -96,35 +74,28 @@ const rawExcretaRelatedList = [ rowStartNum: 2, fixedColumns: 2, columns: [ - /* 1. 행정 및 기본 정보 */ { name: 'SIDO', fieldName: '시도', header: { text: '시도' } }, { name: 'GUGUN', fieldName: '시군구', header: { text: '시군구' } }, { name: 'YR_GBN', fieldName: '구분', header: { text: '구분' } }, - - /* 2. 업체 및 인력 현황 */ { name: 'ECSCS_SM', fieldName: '업체수(개소)', header: { text: '업체수(개소)' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'ECSCS_BSMN', fieldName: '종사인원(명)', header: { text: '종사인원(명)' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, - - /* 3. 시설(차량) 확보현황 (단위: 대수) */ { name: 'VHCLE_SM', fieldName: '계(차량)', header: { text: '계' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'THREE_BELOW', fieldName: '3톤이하', header: { text: '3톤이하' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'FOUR_BELOW', fieldName: '4.5톤이하', header: { text: '4.5톤이하' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'EIGHT_BELOW', fieldName: '8톤이하', header: { text: '8톤이하' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, - { name: 'ETC', fieldName: '기타(차량)', header: { text: '기타' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, - - /* 4. 실적 및 비고 */ + { name: 'ETC_VHCLE', fieldName: '기타(차량)', header: { text: '기타' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, // name 중복 방지를 위해 ETC_VHCLE로 수정 권장 { name: 'COLCT_TRSP_ACMSLT', fieldName: '수집·운반실적(㎥/년)', header: { text: '수집·운반실적\n(㎥/년)' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'RMK', fieldName: '비고', header: { text: '비고' } }, ], columnLayout: [ - { name: 'addrGroup', header: { text: '행정구역' }, items: ['시도', '시군구'] }, - '구분', '업체수(개소)', '종사인원(명)', + { name: 'addrGroup', header: { text: '행정구역' }, items: ['SIDO', 'GUGUN'] }, + 'YR_GBN', 'ECSCS_SM', 'ECSCS_BSMN', { name: 'vehicleGroup', header: { text: '시설(차량) 확보현황(대수)' }, - items: ['계(차량)', '3톤이하', '4.5톤이하', '8톤이하', '기타(차량)'] + items: ['VHCLE_SM', 'THREE_BELOW', 'FOUR_BELOW', 'EIGHT_BELOW', 'ETC_VHCLE'] }, - '수집·운반실적(㎥/년)', '비고' + 'COLCT_TRSP_ACMSLT', 'RMK' ] }, { @@ -133,33 +104,24 @@ const rawExcretaRelatedList = [ rowStartNum: 2, fixedColumns: 2, columns: [ - /* 1. 행정 및 기본 정보 */ { name: 'SIDO', fieldName: '시도', header: { text: '시도' } }, { name: 'GUGUN', fieldName: '시군구', header: { text: '시군구' } }, { name: 'YR_GBN', fieldName: '구분', header: { text: '구분' } }, - - /* 2. 개인하수처리시설 설계ㆍ시공업 */ { name: 'CNSTRCT_ENTRPS', fieldName: '업소수(시공업)', header: { text: '업소수' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'CNSTRCT_BSMN', fieldName: '종사인원(명)_시공업', header: { text: '종사인원(명)' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, - - /* 3. 개인하수처리시설 제조업 */ { name: 'MNFCTUR_ENTRPS', fieldName: '업소수(제조업)', header: { text: '업소수' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'MNFCTUR_BSMN', fieldName: '종사인원(명)_제조업', header: { text: '종사인원(명)' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, - - /* 4. 개인하수처리시설 관리업 */ { name: 'MGMT_ENTRPS', fieldName: '업소수(관리업)', header: { text: '업소수' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, { name: 'MGMT_BSMN', fieldName: '종사인원(명)_관리업', header: { text: '종사인원(명)' }, valueType: ValueType.NUMBER, numberFormat: '#,##0' }, - - /* 5. 기타 및 비고 */ { name: 'RMK', fieldName: '비고', header: { text: '비고' } } ], columnLayout: [ - { name: 'addrGroup', header: { text: '행정구역' }, items: ['시도', '시군구'] }, - '구분', - { name: 'constructGroup', header: { text: '개인하수처리시설 설계ㆍ시공업' }, items: ['업소수(시공업)', '종사인원(명)_시공업'] }, - { name: 'manufactureGroup', header: { text: '개인하수처리시설 제조업' }, items: ['업소수(제조업)', '종사인원(명)_제조업'] }, - { name: 'managementGroup', header: { text: '개인하수처리시설 관리업' }, items: ['업소수(관리업)', '종사인원(명)_관리업'] }, - '비고' + { name: 'addrGroup', header: { text: '행정구역' }, items: ['SIDO', 'GUGUN'] }, + 'YR_GBN', + { name: 'constructGroup', header: { text: '개인하수처리시설 설계ㆍ시공업' }, items: ['CNSTRCT_ENTRPS', 'CNSTRCT_BSMN'] }, + { name: 'manufactureGroup', header: { text: '개인하수처리시설 제조업' }, items: ['MNFCTUR_ENTRPS', 'MNFCTUR_BSMN'] }, + { name: 'managementGroup', header: { text: '개인하수처리시설 관리업' }, items: ['MGMT_ENTRPS', 'MGMT_BSMN'] }, + 'RMK' ] } ];