diff --git a/apps/st/src/components/module/VerificationResultHistoryDialog.tsx b/apps/st/src/components/module/VerificationResultHistoryDialog.tsx index b8ec4a44b..958ccf40d 100644 --- a/apps/st/src/components/module/VerificationResultHistoryDialog.tsx +++ b/apps/st/src/components/module/VerificationResultHistoryDialog.tsx @@ -141,6 +141,7 @@ const verificationResultColumnInfo: ColumnInfo = { columns: [ { name: "ctpvNm", fieldName: "ctpvNm", header: { text: "시도" }, editable: false }, { name: "admdstNm", fieldName: "admdstNm", header: { text: "행정구역" }, editable: false }, + { name: "fcltNm", fieldName: "fcltNm", header: { text: "시설명" }, editable: false }, { name: "vrfcTrgtNm", fieldName: "vrfcTrgtNm", header: { text: "검증대상" }, editable: false }, { name: "rsnExpln", fieldName: "rsnExpln", header: { text: "사유" }, editable: false }, { name: "nowVlCn", fieldName: "nowVlCn", header: { text: "입력값" }, editable: false }, @@ -157,6 +158,7 @@ const verificationResultColumnInfo: ColumnInfo = { columnLayout: [ "ctpvNm", "admdstNm", + "fcltNm", "vrfcTrgtNm", "rsnExpln", "nowVlCn", @@ -178,7 +180,7 @@ export interface VerificationResultHistoryDialogProps { queryContext?: { sewerBzmnCd: string; ctpvNm: string; - sggNm: string; + sggNm?: string; statsYr: string; statsCd: string; } | null; @@ -378,8 +380,9 @@ export function VerificationResultHistoryDialog({ return { vrfcSn: item.vrfcSn, __checked: isChecked ? 1 : 0, - ctpvNm: item.ctpvNm, + ctpvNm: item.ctpvNm ?? "-", admdstNm: item.admdstNm ?? item.sggNm ?? "-", + fcltNm: item.fcltNm ?? "-", vrfcTrgtNm: item.vrfcTrgtNm, rsnExpln: item.rsnExpln, nowVlCn: item.nowVlCn ?? "-", @@ -562,7 +565,7 @@ export function VerificationResultHistoryDialog({ - {`${title} - ${queryContext?.statsYr} ${queryContext?.ctpvNm} ${queryContext?.sggNm}`} + {`${title} - ${queryContext?.statsYr} ${queryContext?.ctpvNm} ${queryContext?.sggNm ? queryContext?.sggNm : ''}`}
{errorMessage && ( diff --git a/apps/st/src/entities/statistics/model/statistics-interface.ts b/apps/st/src/entities/statistics/model/statistics-interface.ts index fa904d5d1..600bd4f94 100644 --- a/apps/st/src/entities/statistics/model/statistics-interface.ts +++ b/apps/st/src/entities/statistics/model/statistics-interface.ts @@ -2,6 +2,8 @@ export interface Sido { adstDstrCd: string; sido: string; bsnmCd: string; + /** Y: 시군구 생략(광역시 등), N: 시군구 필요(도) */ + gugunSkipYn: "Y" | "N"; } export interface SearchCondition { @@ -18,7 +20,7 @@ export interface Sgg { export interface cancelSubmitRequest { statsYr: string; ctpvNm: string; - sggNm: string; + sggNm?: string; sewerBzmnCd: string; statsCd: string; mdfrId: string; @@ -208,6 +210,7 @@ export interface VerificationResultReportItem { prcrId?: string | null; pbcpAprvYn?: string; mdfrId?: string | null; + fcltNm?: string | null; } export interface VerificationResultListPageInfo { @@ -233,7 +236,7 @@ export interface SubmitExceptionRequest { statsYr: string; statsCd: string; ctpvNm: string; - sggNm: string; + sggNm?: string; sewerBzmnCd: string; userId: string; superAdmin?: string; @@ -545,6 +548,7 @@ export interface unSubmitDataResponse { export interface StatisticsService { getSidoList(params?: { instSeCd?: string }): Promise>; + getSidoListInput(params?: { instSeCd?: string }): Promise>; getSggList(sidoName: string, params?: { instSeCd?: string; gugunSkipYn?: "Y" | "N" }): Promise>; getSggAllList(sidoName: string, params?: { instSeCd?: string; gugunSkipYn?: "Y" | "N" }): Promise>; getStatsInputPeriodList(params?: StatsInputPeriodListRequest): Promise;