From 03a08a320addfc4973fe8c8390412449297304f1 Mon Sep 17 00:00:00 2001 From: 100JM Date: Wed, 14 Oct 2026 14:24:03 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[ST]=20-=20fix:=20DB=20=ED=91=9C=EC=A4=80?= =?UTF-8?q?=ED=99=94=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=86=8C=EC=8A=A4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/st/src/components/module/DataGrid.tsx | 28 +- .../ExceptionProcessingHistoryDialog.tsx | 40 +-- apps/st/src/components/module/SearchForm.tsx | 7 +- .../module/SidoSggFacilityNameSearchForm.tsx | 2 +- .../module/VerificationResultDialog.tsx | 20 +- .../VerificationResultHistoryDialog.tsx | 54 +-- .../VerificationSelectionReport.tsx | 4 +- .../input/ExcretaTreatmentFacilityInp.tsx | 76 ++--- .../input/MainFacilityMappingSaveDialog.tsx | 2 +- .../input/PrivateSewageFacilityInp.tsx | 136 ++++---- .../input/PublicSewageFacilityInp.tsx | 54 +-- .../statistics/input/PumpingStationInp.tsx | 52 +-- .../input/SewageExcretaRelatedInp.tsx | 92 +++--- .../input/SewageExcretaSlurgeInp.tsx | 122 +++---- .../statistics/input/SewagePipeInp.tsx | 170 +++++----- .../input/SewagePipeMaintainInp.tsx | 59 ++-- .../input/SewageReservoirPumpInp.tsx | 90 ++--- .../statistics/input/SewerageFinanceInp.tsx | 112 +++---- .../input/SeweragePenetrationRateInp.tsx | 100 +++--- .../input/SewerageServiceLevelInp.tsx | 74 ++--- .../statistics/input/StatsInputStatusInp.tsx | 6 +- .../statistics/input/SubmitDailog.tsx | 50 +-- .../statistics/input/WaterReuseInp.tsx | 66 ++-- .../management/LogHistoryDetailDialog.tsx | 10 +- .../LogHistoryDetailsNestedDialog.tsx | 8 +- .../management/StatisticsInputManagement.tsx | 68 ++-- .../StatisticsInputPeriodDialog.tsx | 86 ++--- .../review/ExcretaTreatmentFacilityRvw.tsx | 24 +- .../review/PrivateSewageFacilityRvw.tsx | 12 +- .../review/PublicSewageFacilityRvw.tsx | 12 +- .../statistics/review/PumpingStationRvw.tsx | 17 +- .../statistics/review/ReturnReasonDialog.tsx | 2 +- .../statistics/review/ReviewOpinionDialog.tsx | 4 +- .../statistics/review/ReviewSubmitDialog.tsx | 10 +- .../review/SewageExcretaRelatedRvw.tsx | 12 +- .../review/SewageExcretaSlurgeRvw.tsx | 12 +- .../review/SewagePipeMaintainRvw.tsx | 12 +- .../statistics/review/SewagePipeRvw.tsx | 12 +- .../review/SewageReservoirPumpRvw.tsx | 12 +- .../statistics/review/SewerageFinanceRvw.tsx | 12 +- .../review/SeweragePenetrationRateRvw.tsx | 12 +- .../review/SewerageServiceLevelRvw.tsx | 12 +- .../statistics/review/StatsInputStatusRvw.tsx | 6 +- .../statistics/review/WaterReuseRvw.tsx | 12 +- .../total/ExcretaTreatmentFacilityTot.tsx | 2 +- .../total/PrivateSewageFacilityTot.tsx | 2 +- .../total/PublicSewageFacilityTot.tsx | 2 +- .../statistics/total/PumpingStationTot.tsx | 2 +- .../total/SewageExcretaRelatedTot.tsx | 2 +- .../total/SewageExcretaSlurgeTot.tsx | 2 +- .../total/SewagePipeMaintainTot.tsx | 2 +- .../statistics/total/SewagePipeTot.tsx | 2 +- .../total/SewageReservoirPumpTot.tsx | 2 +- .../statistics/total/SewerageFinanceTot.tsx | 2 +- .../total/SeweragePenetrationRateTot.tsx | 2 +- .../total/SewerageServiceLevelTot.tsx | 2 +- .../statistics/total/WaterReuseTot.tsx | 2 +- .../StatisticsVerificationReport.tsx | 4 +- .../generalVerification/CopyDialog.tsx | 2 +- .../generalVerification/DetailComponent.tsx | 105 +++--- .../generalVerification/FomulaDialog.tsx | 34 +- .../generalVerification/FormulaComponents.tsx | 4 +- .../OperatorsComponents.tsx | 11 +- .../generalVerification/RegistDialog.tsx | 46 +-- apps/st/src/components/type/DataGrid.type.ts | 10 +- .../st/src/components/type/SearchForm.type.ts | 4 +- .../components/util/column/input/DoList.ts | 2 + .../column/input/ExcretaTreatFactInpColumn.ts | 62 ++-- .../column/input/PumpingStationInpColumn.ts | 50 +-- .../input/SeweragePenetrationRateInpColumn.ts | 94 +++--- .../PrivateSewageDesigStatusInpColumn.ts | 16 +- .../SepticTankStatusInpColumn.ts | 312 +++++++++--------- .../SewageTreatFactStatusInpColumn.ts | 130 ++++---- .../ExcretaRelatedIndustryInpColumn.ts | 20 +- ...blicInstitutionExcretaIndustryInpColumn.ts | 18 +- ...PublicInstitutionSewerIndustryInpColumn.ts | 18 +- .../DigestorOperatingStatusInpColumn.ts | 56 ++-- .../ExcretaSlurgeProcessingStatusInpColumn.ts | 12 +- ...ewageSlurgeProcessingFacStatusInpColumn.ts | 16 +- .../SlurgeProcessingFacStatusInpColumn.ts | 164 ++++----- .../sewagePipe/FactInstallStatusInpColumn.ts | 56 ++-- .../sewagePipe/PipeDiameterStatusInpColumn.ts | 44 +-- .../sewagePipe/RegionalFactStatusInpColumn.ts | 56 ++-- .../PipeDredgingStatusInpColumn.ts | 12 +- .../RepairStatusInpColumn.ts | 36 +- .../RainfallPumpStationInpColumn.ts | 52 +-- .../SewageReservoirInpColumn.ts | 64 ++-- .../sewerageFinance/CauserBurdenInpColumn.ts | 26 +- .../SewerageChargeInpColumn.ts | 28 +- .../SewerageFinanceSettleInpColumn.ts | 58 ++-- .../SewerageUsageFeeInpColumn.ts | 76 ++--- .../ComplaintInpColumn.ts | 54 +-- .../ResidentFriendlyFactInpColumn.ts | 50 +-- .../RainFallUtilFactStatusInpColumn.ts | 30 +- .../RecycledWaterStatusInpColumn.ts | 16 +- .../column/management/LogHistoryColumn.ts | 8 +- .../management/LogHistoryDetailColumn.ts | 11 +- .../ExcretaTreatmentFacilityRvwColumn.ts | 114 +++---- .../review/PrivateSewageFacilityColumn.ts | 212 ++++++------ .../column/review/PumpingStationRvwColumn.ts | 70 ++-- .../review/SewageExcretaRelatedRvwColumn.ts | 32 +- .../review/SewageExcretaSlurgeRvwColumn.ts | 182 +++++----- .../review/SewagePipeMaintainRvwColumn.ts | 34 +- .../util/column/review/SewagePipeRvwColumn.ts | 100 +++--- .../review/SewageReservoirPumpRvwColumn.ts | 83 ++--- .../column/review/SewerageFinanceRvwColumn.ts | 98 +++--- .../SeweragePenetrationRateRvwColumn.ts | 50 +-- .../review/SewerageServiceLevelRvwColumn.ts | 72 ++-- .../util/column/review/WaterReuseRvwColumn.ts | 48 +-- .../util/column/total/SewagePipeTotColumn.ts | 155 +++++---- .../SewerExcretaTreatmentStatusColumn.ts | 52 +-- .../total/SewerMediationPumpStatusColumn.ts | 44 +-- .../total/SeweragePentrationRateTotColumn.ts | 64 ++-- .../HumanWasteCollectionTab3Column.ts | 10 +- .../PublicHumanWasteStaffTab2Column.ts | 8 +- .../PublicSewageStaffTab1Column.ts | 8 +- .../PipeDredgingStatusTotColumn.ts | 12 +- .../RepairStatusTotColumn.ts | 28 +- .../SewerPrivateSewageTab1Column.ts | 40 +-- .../SewerPrivateSewageTab2Column.ts | 80 ++--- .../SewerPrivateSewageTab3Column.ts | 12 +- .../SewerPumpStationStatusColumn.ts | 40 +-- .../SewerReservoirStatusColumn.ts | 46 +-- .../SewerageFeeTab2Column.ts | 10 +- .../SewerageFinancialTab1Column.ts | 64 ++-- .../SewerageOrgCauseTab4Column.ts | 16 +- .../SewerageGrayWaterTab2Column.ts | 12 +- .../SewerageRainwaterTab3Column.ts | 12 +- .../sewerageReuse/SewerageReuseTab1Column.ts | 10 +- .../SewerageWwtRtlztnRegTab4Column.ts | 4 +- .../ComplaintTotColumn.ts | 22 +- .../ResidentFriendlyFactTotColumn.ts | 23 +- .../DigestionTankTab2Column.ts | 26 +- .../HumanWasteSludgeTab4Column.ts | 8 +- .../SewageSludgeOperTab3Column.ts | 8 +- .../SludgeProcessingTab1Column.ts | 84 ++--- .../util/input/verification-result-display.ts | 6 +- .../api/general-verification-service.ts | 6 +- .../statistics/api/statistics-service.ts | 2 +- .../model/general-verification-interface.ts | 50 +-- ...neral-verification-master-submit-schema.ts | 8 +- ...ut-excreta-treatment-facility-interface.ts | 86 ++--- ...input-private-sewage-facility-interface.ts | 270 +++++++-------- ...tistics-input-pumping-station-interface.ts | 50 +-- ...-input-sewage-excreta-related-interface.ts | 56 ++-- ...s-input-sewage-excreta-slurge-interface.ts | 216 ++++++------ ...cs-input-sewage-pipe-maintain-interface.ts | 87 ++--- ...s-input-sewage-reservoir-pump-interface.ts | 126 +++---- ...istics-input-sewerage-finance-interface.ts | 184 +++++------ ...-input-sewerage-service-level-interface.ts | 116 +++---- .../statistics-input-water-reuse-interface.ts | 144 ++++---- ...-public-sewage-facility-input-interface.ts | 40 +-- .../statistics-sewage-pipe-input-interface.ts | 129 ++++---- ...tics-sewage-supply-rate-input-interface.ts | 104 +++--- .../sewage-reservoir-pump-review-interface.ts | 183 +++++----- .../model/statistics-approval-interface.ts | 4 +- ...eta-treatment-facility-review-interface.ts | 42 +-- .../statistics-input-submit-info-schema.ts | 18 +- .../statistics/model/statistics-interface.ts | 130 ++++---- ...rivate-sewage-facility-review-interface.ts | 106 +++--- ...istics-pumping-station-review-interface.ts | 22 +- ...sewage-excreta-related-review-interface.ts | 12 +- ...-sewage-excreta-slurge-review-interface.ts | 125 ++++--- ...istics-sewage-pipe-mtc-review-interface.ts | 86 +++-- ...statistics-sewage-pipe-review-interface.ts | 141 ++++---- ...stics-sewerage-finance-review-interface.ts | 56 ++-- ...s-sewerage-penetration-review-interface.ts | 38 +-- ...sewerage-service-level-review-interface.ts | 36 +- ...stics-excreta-treatment-total-interface.ts | 42 +-- ...atistics-mediation-pump-total-interface.ts | 33 +- ...atistics-private-sewage-total-interface.ts | 116 ++++--- ...tatistics-service-level-total-interface.ts | 37 ++- ...cs-sewage-pipe-maintain-total-interface.ts | 26 +- .../statistics-sewage-pipe-total-interface.ts | 83 ++--- ...istics-sewage-reservoir-total-interface.ts | 93 +++--- ...tics-sewage-supply-rate-total-interface.ts | 49 ++- ...istics-sewerage-finance-total-interface.ts | 40 +-- .../statistics-sewerage-industry-interface.ts | 22 +- ...atistics-sewerage-reuse-total-interface.ts | 30 +- .../statistics-sludge-total-interface.ts | 118 +++---- ...statistics-water-reuse-review-interface.ts | 36 +- .../verification-input-report-interface.ts | 4 +- 182 files changed, 4533 insertions(+), 4544 deletions(-) diff --git a/apps/st/src/components/module/DataGrid.tsx b/apps/st/src/components/module/DataGrid.tsx index dd2f84f6f..bb0f66e1e 100644 --- a/apps/st/src/components/module/DataGrid.tsx +++ b/apps/st/src/components/module/DataGrid.tsx @@ -2403,16 +2403,16 @@ useEffect(() => {
진행상황:{" "} - {statusInfo.laeSbmsnSttsCd === null || - statusInfo.laeSbmsnSttsCd === "0" ? ( + {statusInfo.lclgvSbmsnSttsCd === null || + statusInfo.lclgvSbmsnSttsCd === "0" ? ( "미작성" - ) : statusInfo.laeSbmsnSttsCd === "1" ? ( + ) : statusInfo.lclgvSbmsnSttsCd === "1" ? ( 작성중 - ) : statusInfo.laeSbmsnSttsCd === "2" ? ( + ) : statusInfo.lclgvSbmsnSttsCd === "2" ? ( 제출 - ) : statusInfo.laeSbmsnSttsCd === "3" ? ( + ) : statusInfo.lclgvSbmsnSttsCd === "3" ? ( 승인 - ) : statusInfo.laeSbmsnSttsCd === "4" ? ( + ) : statusInfo.lclgvSbmsnSttsCd === "4" ? ( 반려 @@ -2432,21 +2432,21 @@ useEffect(() => { 제출일:{" "} - {statusInfo.laeSbmsnYmd - ? statusInfo.laeSbmsnYmd.length === 8 && - /^\d{8}$/.test(statusInfo.laeSbmsnYmd) - ? `${statusInfo.laeSbmsnYmd.slice(0, 4)}-${statusInfo.laeSbmsnYmd.slice(4, 6)}-${statusInfo.laeSbmsnYmd.slice(6, 8)}` - : statusInfo.laeSbmsnYmd + {statusInfo.lclgvSbmsnYmd + ? statusInfo.lclgvSbmsnYmd.length === 8 && + /^\d{8}$/.test(statusInfo.lclgvSbmsnYmd) + ? `${statusInfo.lclgvSbmsnYmd.slice(0, 4)}-${statusInfo.lclgvSbmsnYmd.slice(4, 6)}-${statusInfo.lclgvSbmsnYmd.slice(6, 8)}` + : statusInfo.lclgvSbmsnYmd : "미제출"} 담당자:{" "} - {statusInfo.laePicNm ? statusInfo.laePicNm : "-"} + {statusInfo.lclgvPicNm ? statusInfo.lclgvPicNm : "-"} 연락처:{" "} - {statusInfo.laePicTelNo - ? statusInfo.laePicTelNo + {statusInfo.lclgvPicTelnoCn + ? statusInfo.lclgvPicTelnoCn : "-"}
diff --git a/apps/st/src/components/module/ExceptionProcessingHistoryDialog.tsx b/apps/st/src/components/module/ExceptionProcessingHistoryDialog.tsx index 4626425b6..9e1dfcc0c 100644 --- a/apps/st/src/components/module/ExceptionProcessingHistoryDialog.tsx +++ b/apps/st/src/components/module/ExceptionProcessingHistoryDialog.tsx @@ -70,7 +70,7 @@ export type ExceptionRejectSubmitItem = { statsYr: string; sewerBzmnCd: string; statsCd: string; - mdfrId: string; + mdfrUuid: string; rjctOpnnCn?: string; }; @@ -84,8 +84,8 @@ function prcsYnCodeToNumber(raw: string | number | undefined): number | undefine } function exceptionPrcsYnNmCellStyle({ fieldName, row }: CellStyleCallbackParams): string | undefined { - if (fieldName !== "prcsYnNm") return undefined; - const code = prcsYnCodeToNumber(row.prcsYn); + if (fieldName !== "vrfcSttsNm") return undefined; + const code = prcsYnCodeToNumber(row.vrfcSttsCd); if (code === 0 || code === 4) return "rg-cell-vrf-prcs-bad"; return "rg-cell-vrf-prcs-ok"; } @@ -96,10 +96,10 @@ const exceptionHistoryColumnInfo: ColumnInfo = { { name: "admdstNm", fieldName: "admdstNm", 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 }, - { name: "compVlCn", fieldName: "compVlCn", header: { text: "기준값" }, editable: false }, - { name: "prcsYnNm", fieldName: "prcsYnNm", header: { text: "처리여부" }, editable: false }, - { name: "stVrfRjtComNm", fieldName: "stVrfRjtComNm", header: { text: "반려상태" }, editable: false }, + { name: "nowCn", fieldName: "nowCn", header: { text: "입력값" }, editable: false }, + { name: "cmprCn", fieldName: "cmprCn", header: { text: "기준값" }, editable: false }, + { name: "vrfcSttsNm", fieldName: "vrfcSttsNm", header: { text: "처리여부" }, editable: false }, + { name: "statsVrfcRjtComNm", fieldName: "statsVrfcRjtComNm", header: { text: "반려상태" }, editable: false }, { name: "prcsOpnnExpln", fieldName: "prcsOpnnExpln", header: { text: "처리의견" }, editable: false }, { name: "rjctOpnnCn", fieldName: "rjctOpnnCn", header: { text: "반려의견" }, editable: false }, { name: "regDt", fieldName: "regDt", header: { text: "등록일시" }, editable: false }, @@ -112,7 +112,7 @@ const exceptionHistoryColumnInfo: ColumnInfo = { width: 104, styleName: "rg-cell-reject-mini-btn", }, - { name: "prcsYn", fieldName: "prcsYn", header: { text: "검증결과상태코드" }, editable: false, visible: false }, + { name: "vrfcSttsCd", fieldName: "vrfcSttsCd", header: { text: "검증결과상태코드" }, editable: false, visible: false }, { name: "vrfcSn", fieldName: "vrfcSn", header: { text: "vrfcSn" }, editable: false, visible: false }, ], columnLayout: [ @@ -120,16 +120,16 @@ const exceptionHistoryColumnInfo: ColumnInfo = { "admdstNm", "vrfcTrgtNm", "rsnExpln", - "nowVlCn", - "compVlCn", - "prcsYnNm", - "stVrfRjtComNm", + "nowCn", + "cmprCn", + "vrfcSttsNm", + "statsVrfcRjtComNm", "prcsOpnnExpln", "rjctOpnnCn", "regDt", "mdfcnDt", "individualReject", - "prcsYn", + "vrfcSttsCd", "vrfcSn", ], }; @@ -316,13 +316,13 @@ export function ExceptionProcessingHistoryDialog({ admdstNm: item.admdstNm ?? item.sggNm ?? "-", vrfcTrgtNm: item.vrfcTrgtNm, rsnExpln: item.rsnExpln, - nowVlCn: item.nowVlCn ?? "-", - compVlCn: item.compVlCn ?? "-", - prcsYnNm: item.prcsYnNm ?? "-", - stVrfRjtComNm: item.stVrfRjtComNm ?? "-", + nowCn: item.nowCn ?? "-", + cmprCn: item.cmprCn ?? "-", + vrfcSttsNm: item.vrfcSttsNm ?? "-", + statsVrfcRjtComNm: item.statsVrfcRjtComNm ?? "-", prcsOpnnExpln: item.prcsOpnnExpln ?? "-", rjctOpnnCn: item.rjctOpnnCn ?? "-", - prcsYn: item.prcsYn ?? "", + vrfcSttsCd: item.vrfcSttsCd ?? "", regDt: (item.regDt ?? "").slice(0, 16), mdfcnDt: (item.mdfcnDt ?? "").slice(0, 16), individualReject: "개별 반려", @@ -401,7 +401,7 @@ export function ExceptionProcessingHistoryDialog({ alert("사용자 정보를 불러오지 못했습니다."); return; } - const mdfrId = userInfo.userUnqId; + const mdfrUuid = userInfo.userUnqId; const trimmedReason = rejectReasonText.trim(); const items: ReviewInputSaveRequest[] = pendingRejectVrfcSns.map((vrfcSn) => ({ @@ -409,7 +409,7 @@ export function ExceptionProcessingHistoryDialog({ statsYr: queryContext.statsYr, sewerBzmnCd: queryContext.sewerBzmnCd, statsCd: queryContext.statsCd, - mdfrId, + mdfrUuid, vrfcSn: String(vrfcSn), ...(trimmedReason ? { rjctOpnnCn: trimmedReason } : {}), })); diff --git a/apps/st/src/components/module/SearchForm.tsx b/apps/st/src/components/module/SearchForm.tsx index fc1a3ca5f..c1a1d2fd9 100644 --- a/apps/st/src/components/module/SearchForm.tsx +++ b/apps/st/src/components/module/SearchForm.tsx @@ -145,6 +145,9 @@ const SearchForm = (props: SearchFormProps = {}) => { const currentYear = new Date().getFullYear(); const defaultYear = currentYear - 1; const isInput = Boolean(props.isInput); + const isDetailInputId = props.tabKey + ? `${props.tabKey}-isDetail` + : "isDetail"; const sidoListKind = isInput ? "input" : "default"; const { data: sidoList } = useSWR>( @@ -479,12 +482,12 @@ const SearchForm = (props: SearchFormProps = {}) => {
setValues({ diff --git a/apps/st/src/components/module/SidoSggFacilityNameSearchForm.tsx b/apps/st/src/components/module/SidoSggFacilityNameSearchForm.tsx index 0063d0d4c..a6b13b323 100644 --- a/apps/st/src/components/module/SidoSggFacilityNameSearchForm.tsx +++ b/apps/st/src/components/module/SidoSggFacilityNameSearchForm.tsx @@ -399,7 +399,7 @@ const SidoSggFacilityNameSearchForm = ({ swtrmtFcltNm: String(selectedFacilityRow.fcltNm ?? ""), prcsFcltCpct: Number(selectedFacilityRow.fcltCpct ?? 0), sewerBzmnCd: initialSearchValues?.bsnmCd?.trim() ?? "", - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList, deleteList, }; diff --git a/apps/st/src/components/module/VerificationResultDialog.tsx b/apps/st/src/components/module/VerificationResultDialog.tsx index 4fda1f5a0..22b77050f 100644 --- a/apps/st/src/components/module/VerificationResultDialog.tsx +++ b/apps/st/src/components/module/VerificationResultDialog.tsx @@ -101,9 +101,9 @@ const verificationSubmitResultColumnInfo: ColumnInfo = { { 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 }, - { name: "compVlCn", fieldName: "compVlCn", header: { text: "기준값" }, editable: false }, - { name: "prcsYn", fieldName: "prcsYn", header: { text: "처리여부" }, editable: false }, + { name: "nowCn", fieldName: "nowCn", header: { text: "입력값" }, editable: false }, + { name: "cmprCn", fieldName: "cmprCn", header: { text: "기준값" }, editable: false }, + { name: "vrfcSttsNm", fieldName: "vrfcSttsNm", header: { text: "처리여부" }, editable: false }, { name: "regDt", fieldName: "regDt", header: { text: "등록일시" }, editable: false }, { name: "mdfcnDt", fieldName: "mdfcnDt", header: { text: "갱신일시" }, editable: false }, { @@ -120,9 +120,9 @@ const verificationSubmitResultColumnInfo: ColumnInfo = { "fcltNm", "vrfcTrgtNm", "rsnExpln", - "nowVlCn", - "compVlCn", - "prcsYn", + "nowCn", + "cmprCn", + "vrfcSttsNm", "regDt", "mdfcnDt", "prcsOpnnExpln", @@ -211,9 +211,9 @@ export function VerificationResultDialog({ fcltNm: item.fcltNm ?? "-", vrfcTrgtNm: item.vrfcTrgtNm, rsnExpln: item.rsnExpln, - nowVlCn: item.nowVlCn ?? "-", - compVlCn: item.compVlCn ?? "-", - prcsYn: item.prcsYnNm ?? PRCS_YN_LABEL[item.prcsYn] ?? item.prcsYn, + nowCn: item.nowCn ?? "-", + cmprCn: item.cmprCn ?? "-", + vrfcSttsNm: item.vrfcSttsNm ?? PRCS_YN_LABEL[item.vrfcSttsCd] ?? item.vrfcSttsCd, regDt: (item.regDt ?? "").slice(0, 16), mdfcnDt: (item.mdfcnDt ?? "").slice(0, 16), prcsOpnnExpln: item.prcsOpnnExpln ?? "", @@ -351,7 +351,7 @@ export function VerificationResultDialog({ sewerBzmnCd: stableQueryContext.sewerBzmnCd, statsYr: stableQueryContext.statsYr, statsCd: stableQueryContext.statsCd, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, exceptionList: payload, }); if (response.status === "success") { diff --git a/apps/st/src/components/module/VerificationResultHistoryDialog.tsx b/apps/st/src/components/module/VerificationResultHistoryDialog.tsx index 9eff0b060..6b06667cd 100644 --- a/apps/st/src/components/module/VerificationResultHistoryDialog.tsx +++ b/apps/st/src/components/module/VerificationResultHistoryDialog.tsx @@ -113,7 +113,7 @@ function syncCheckedMapFromGrid( if (!entry) continue; const sn = Number(entry.vrfcSn); if (!Number.isFinite(sn)) continue; - next.set(sn, String(entry.prcsYn ?? "")); + next.set(sn, String(entry.vrfcSttsCd ?? "")); } return next; } @@ -124,15 +124,15 @@ function selectionHasNonExceptionResetAllowed( ): boolean { for (const [vrfcSn, storedPrcsYn] of map) { const onPage = currentEntries.find((e) => Number(e.vrfcSn) === vrfcSn); - const prcsYn = onPage ? onPage.prcsYn : storedPrcsYn; + const prcsYn = onPage ? onPage.vrfcSttsCd : storedPrcsYn; if (!canExceptionReset(prcsYn)) return true; } return false; } function verificationPrcsYnNmCellStyle({ fieldName, row }: CellStyleCallbackParams): string | undefined { - if (fieldName !== "prcsYnNm") return undefined; - const code = prcsYnCodeToNumber(row.prcsYn); + if (fieldName !== "vrfcSttsNm") return undefined; + const code = prcsYnCodeToNumber(row.vrfcSttsCd); if (code === 0 || code === 3) return "rg-cell-vrf-prcs-bad"; return "rg-cell-vrf-prcs-ok"; } @@ -144,15 +144,15 @@ const verificationResultColumnInfo: ColumnInfo = { { 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 }, - { name: "compVlCn", fieldName: "compVlCn", header: { text: "기준값" }, editable: false }, - { name: "prcsYnNm", fieldName: "prcsYnNm", header: { text: "처리여부" }, editable: false }, - { name: "stVrfRjtComNm", fieldName: "stVrfRjtComNm", header: { text: "반려상태" }, editable: false }, + { name: "nowCn", fieldName: "nowCn", header: { text: "입력값" }, editable: false }, + { name: "cmprCn", fieldName: "cmprCn", header: { text: "기준값" }, editable: false }, + { name: "vrfcSttsNm", fieldName: "vrfcSttsNm", header: { text: "처리여부" }, editable: false }, + { name: "statsVrfcRjtComNm", fieldName: "statsVrfcRjtComNm", header: { text: "반려상태" }, editable: false }, { name: "prcsOpnnExpln", fieldName: "prcsOpnnExpln", header: { text: "처리의견" }, editable: false }, { name: "rjctOpnnCn", fieldName: "rjctOpnnCn", header: { text: "반려의견" }, editable: false }, { name: "regDt", fieldName: "regDt", header: { text: "등록일시" }, editable: false }, { name: "mdfcnDt", fieldName: "mdfcnDt", header: { text: "갱신일시" }, editable: false }, - { name: "prcsYn", fieldName: "prcsYn", header: { text: "검증결과상태코드" }, editable: false, visible: false }, + { name: "vrfcSttsCd", fieldName: "vrfcSttsCd", header: { text: "검증결과상태코드" }, editable: false, visible: false }, { name: "vrfcSn", fieldName: "vrfcSn", header: { text: "검증일련번호" }, editable: false, visible: false }, ], columnLayout: [ @@ -161,15 +161,15 @@ const verificationResultColumnInfo: ColumnInfo = { "fcltNm", "vrfcTrgtNm", "rsnExpln", - "nowVlCn", - "compVlCn", - "prcsYnNm", - "stVrfRjtComNm", + "nowCn", + "cmprCn", + "vrfcSttsNm", + "statsVrfcRjtComNm", "prcsOpnnExpln", "rjctOpnnCn", "regDt", "mdfcnDt", - "prcsYn", + "vrfcSttsCd", "vrfcSn", ], }; @@ -385,13 +385,13 @@ export function VerificationResultHistoryDialog({ fcltNm: item.fcltNm ?? "-", vrfcTrgtNm: item.vrfcTrgtNm, rsnExpln: item.rsnExpln, - nowVlCn: item.nowVlCn ?? "-", - compVlCn: item.compVlCn ?? "-", - prcsYnNm: item.prcsYnNm ?? "-", - stVrfRjtComNm: item.stVrfRjtComNm ?? "-", + nowCn: item.nowCn ?? "-", + cmprCn: item.cmprCn ?? "-", + vrfcSttsNm: item.vrfcSttsNm ?? "-", + statsVrfcRjtComNm: item.statsVrfcRjtComNm ?? "-", prcsOpnnExpln: item.prcsOpnnExpln ?? "-", rjctOpnnCn: item.rjctOpnnCn ?? "-", - prcsYn: item.prcsYn ?? "", + vrfcSttsCd: item.vrfcSttsCd ?? "", regDt: (item.regDt ?? "").slice(0, 16), mdfcnDt: (item.mdfcnDt ?? "").slice(0, 16), }; @@ -434,10 +434,10 @@ export function VerificationResultHistoryDialog({ } setCheckedVrfcByTab((prev) => ({ ...prev, [tab]: syncedMap })); const vrfcSnList = Array.from(syncedMap.keys()); - let mdfrId: string; + let mdfrUuid: string; try { const userInfo = await getUserInfo(); - mdfrId = userInfo.userUnqId; + mdfrUuid = userInfo.userUnqId; } catch { alert("사용자 정보를 불러오지 못했습니다."); return; @@ -449,7 +449,7 @@ export function VerificationResultHistoryDialog({ statsYr: stableQueryContext.statsYr, sewerBzmnCd: stableQueryContext.sewerBzmnCd, statsCd: stableQueryContext.statsCd, - mdfrId, + mdfrUuid, vrfcSnList, }); if (response.status !== "success") { @@ -512,13 +512,13 @@ export function VerificationResultHistoryDialog({ if (!entry) return; const vrfcSn = Number(entry.vrfcSn); if (!Number.isFinite(vrfcSn)) return; - if (checked && !canExceptionReset(entry.prcsYn)) { + if (checked && !canExceptionReset(entry.vrfcSttsCd)) { alert(EXCEPTION_RESET_ONLY_PRCS_YN_2_MESSAGE); uncheckGridRow(gridRef, itemIndex); return; } updateCheckedVrfcForTab(tab, (map) => { - if (checked) map.set(vrfcSn, String(entry.prcsYn ?? "")); + if (checked) map.set(vrfcSn, String(entry.vrfcSttsCd ?? "")); else map.delete(vrfcSn); }); }} @@ -531,14 +531,14 @@ export function VerificationResultHistoryDialog({ map.delete(vrfcSn); return; } - if (canExceptionReset(entry.prcsYn)) { - map.set(vrfcSn, String(entry.prcsYn ?? "")); + if (canExceptionReset(entry.vrfcSttsCd)) { + map.set(vrfcSn, String(entry.vrfcSttsCd ?? "")); } else { uncheckGridRow(gridRef, itemIndex); } }); }); - if (checked && entries.some((e) => !canExceptionReset(e.prcsYn))) { + if (checked && entries.some((e) => !canExceptionReset(e.vrfcSttsCd))) { alert(EXCEPTION_RESET_ONLY_PRCS_YN_2_MESSAGE); } }} diff --git a/apps/st/src/components/statistics/VerificationSelectionReport.tsx b/apps/st/src/components/statistics/VerificationSelectionReport.tsx index 35996dcb7..a01fad3f0 100644 --- a/apps/st/src/components/statistics/VerificationSelectionReport.tsx +++ b/apps/st/src/components/statistics/VerificationSelectionReport.tsx @@ -379,8 +379,8 @@ const VerificationSelectionReport = ({
{formatReportItemRegion(item)} - 현재: {item.nowVlCn ?? "-"} / 비교:{" "} - {item.compVlCn ?? "-"} + 현재: {item.nowCn ?? "-"} / 비교:{" "} + {item.cmprCn ?? "-"}
diff --git a/apps/st/src/components/statistics/input/ExcretaTreatmentFacilityInp.tsx b/apps/st/src/components/statistics/input/ExcretaTreatmentFacilityInp.tsx index ee283d640..618560af3 100644 --- a/apps/st/src/components/statistics/input/ExcretaTreatmentFacilityInp.tsx +++ b/apps/st/src/components/statistics/input/ExcretaTreatmentFacilityInp.tsx @@ -93,8 +93,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (["2", "3"].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (["2", "3"].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -130,7 +130,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === "2"; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === "2"; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = @@ -257,35 +257,35 @@ function buildExcretaTreatmentFacilitySaveItem( fcltSn: nullableTrimmedString(row.fcltSn), fcltNm: nullableTrimmedString(row.fcltNm), fcltPstnCn: nullableTrimmedString(row.fcltPstnCn), - telNo: nullableTrimmedString(row.telNo), + telnoCn: nullableTrimmedString(row.telnoCn), cmptnStrtYmd: toApiYmd(row.cmptnStrtYmd), oprtngStrtYmd: toApiYmd(row.oprtngStrtYmd), wholPjtcoAmt: toGridNumber(row.wholPjtcoAmt), - prcsFcltCpct: toGridNumber(row.prcsFcltCpct), - cpct: toGridNumber(row.cpct), - oprtngDayCnt: toGridNumber(row.oprtngDayCnt), - prcsMthdExpln: nullableTrimmedString(row.prcsMthdExpln), + fcltCpct: toGridNumber(row.fcltCpct), + excrFcltPrcqty: toGridNumber(row.excrFcltPrcqty), + fcltOprtngDayCnt: toGridNumber(row.fcltOprtngDayCnt), + prcsExpln: nullableTrimmedString(row.prcsExpln), linkTmplntCn: nullableTrimmedString(row.linkTmplntCn), linkPrcsQnt: toGridNumber(row.linkPrcsQnt), - inflwBodWqVl: toGridNumber(row.inflwBodWqVl), - inflwTocWqVl: toGridNumber(row.inflwTocWqVl), - inflwSsWqVl: toGridNumber(row.inflwSsWqVl), - inflwTnWqVl: toGridNumber(row.inflwTnWqVl), - inflwTpWqVl: toGridNumber(row.inflwTpWqVl), - inflwClfgCnt: toGridNumber(row.inflwClfgCnt), - dschgBodWqVl: toGridNumber(row.dschgBodWqVl), - dschgTocWqVl: toGridNumber(row.dschgTocWqVl), - dschgSsWqVl: toGridNumber(row.dschgSsWqVl), - dschgTnWqVl: toGridNumber(row.dschgTnWqVl), - dschgTpWqVl: toGridNumber(row.dschgTpWqVl), - dschgClfgCnt: toGridNumber(row.dschgClfgCnt), - wtsysNm: nullableTrimmedString(row.wtsysNm), - trbtrNm: nullableTrimmedString(row.trbtrNm), + inflwWqBod: toGridNumber(row.inflwWqBod), + inflwWqTorgcb: toGridNumber(row.inflwWqTorgcb), + inflwWqSpsld: toGridNumber(row.inflwWqSpsld), + inflwWqDtn: toGridNumber(row.inflwWqDtn), + inflwWqTph: toGridNumber(row.inflwWqTph), + fcltInflwClfgCnt: toGridNumber(row.fcltInflwClfgCnt), + dschgWqBod: toGridNumber(row.dschgWqBod), + dschgWqTorgcb: toGridNumber(row.dschgWqTorgcb), + dschgWqSpsld: toGridNumber(row.dschgWqSpsld), + dschgWqDtn: toGridNumber(row.dschgWqDtn), + dschgWqTph: toGridNumber(row.dschgWqTph), + fcltDschgClfgCnt: toGridNumber(row.fcltDschgClfgCnt), + fcltWtsysNm: nullableTrimmedString(row.fcltWtsysNm), + fcltTrbtrNm: nullableTrimmedString(row.fcltTrbtrNm), msirbCn: nullableTrimmedString(row.msirbCn), ssirbCn: nullableTrimmedString(row.ssirbCn), - operMthdCdCn: nullableTrimmedString(row.operMthdCdCn), + operCn: nullableTrimmedString(row.operCn), wholNope: toGridNumber(row.wholNope), - sftyAcdntEvntcsCnt: toGridNumber(row.sftyAcdntEvntcsCnt), + sftyAcdntNocs: toGridNumber(row.sftyAcdntNocs), rmrk: nullableTrimmedString(row.rmrk), }; } @@ -615,7 +615,7 @@ const ExcretaTreatmentFacilityInp = () => { ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), ctpvNm: lastSearchedValues.sido ?? "", statsYr: lastSearchedValues.year ?? "", - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCd || EXCRETA_TREATMENT_FACILITY_STATS_CD, }; @@ -674,7 +674,7 @@ const ExcretaTreatmentFacilityInp = () => { statsYr: lastSearchedValues.year ?? "", ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), noApplicable, saveList, @@ -775,15 +775,15 @@ const ExcretaTreatmentFacilityInp = () => { statsYr: lastSearchedValues.year ?? "", ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - userId: userInfo.userUnqId, - laePicNm: submitInfo.laePicNm, - laePicTelNo: submitInfo.laePicTelNo, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, + userUuid: userInfo.userUnqId, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), noApplicable, submitList, @@ -808,7 +808,7 @@ const ExcretaTreatmentFacilityInp = () => { stats_cd: statsCdForSubmit, stats_yr: lastSearchedValues.year ?? "", lae_sbmsn_stts_cd: - statusInfo?.laeSbmsnSttsCd === "4" ? "4" : "2", + statusInfo?.lclgvSbmsnSttsCd === "4" ? "4" : "2", gen_verify_stts_cd: nvpassed ? "1" : "2", hb_pass_yn: response.data?.isHbPassed, }; @@ -962,7 +962,7 @@ const ExcretaTreatmentFacilityInp = () => { ? "일반검증 - " : "모집단 검증 -"; return `${prefix}${e.rsnExpln} -(검증 기준값: ${e.compVlCn} / 현재 입력값: ${e.nowVlCn})`; +(검증 기준값: ${e.cmprCn} / 현재 입력값: ${e.nowCn})`; }) .filter(Boolean) .join("\n"); @@ -1044,7 +1044,7 @@ const ExcretaTreatmentFacilityInp = () => { {submitOk && } )} - {statusInfo?.laeSbmsnSttsCd === "2" && submitOk && ( + {statusInfo?.lclgvSbmsnSttsCd === "2" && submitOk && ( )} {showSaveInToolbar && } diff --git a/apps/st/src/components/statistics/input/MainFacilityMappingSaveDialog.tsx b/apps/st/src/components/statistics/input/MainFacilityMappingSaveDialog.tsx index 70ab2ecef..c171c529d 100644 --- a/apps/st/src/components/statistics/input/MainFacilityMappingSaveDialog.tsx +++ b/apps/st/src/components/statistics/input/MainFacilityMappingSaveDialog.tsx @@ -249,7 +249,7 @@ export function MainFacilityMappingSaveDialog({ setIsSubmitting(true); await onConfirm?.({ prxyBzentyNmCn: prxyBzentyNmCn.trim(), - cnsgnCstVl, + cnsgnCstVl: cnsgnCstVl, wholNope, prxyCtrtCn: prxyCtrtCnParam, }); diff --git a/apps/st/src/components/statistics/input/PrivateSewageFacilityInp.tsx b/apps/st/src/components/statistics/input/PrivateSewageFacilityInp.tsx index 70475e362..844cbe390 100644 --- a/apps/st/src/components/statistics/input/PrivateSewageFacilityInp.tsx +++ b/apps/st/src/components/statistics/input/PrivateSewageFacilityInp.tsx @@ -119,8 +119,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (["2", "3"].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (["2", "3"].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -148,7 +148,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === "2"; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === "2"; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = isSubmitted && periodEnterable && gugunOk; @@ -210,20 +210,20 @@ function buildSewageTreatFactStatusSaveList( return currentData.map((d) => ({ admdstCd: nullableTrimmedString(d.admdstCd), admdstNm: nullableTrimmedString(d.admdstNm), - step1StaaPrcsQnt: formatNumber(d.step1StaaPrcsQnt, "step1StaaPrcsQnt"), - step2StaaPrcsQnt: formatNumber(d.step2StaaPrcsQnt, "step2StaaPrcsQnt"), - step3StaaPrcsQnt: formatNumber(d.step3StaaPrcsQnt, "step3StaaPrcsQnt"), - step4StaaPrcsQnt: formatNumber(d.step4StaaPrcsQnt, "step4StaaPrcsQnt"), - step5StaaPrcsQnt: formatNumber(d.step5StaaPrcsQnt, "step5StaaPrcsQnt"), - step6StaaPrcsQnt: formatNumber(d.step6StaaPrcsQnt, "step6StaaPrcsQnt"), - step7StaaPrcsQnt: formatNumber(d.step7StaaPrcsQnt, "step7StaaPrcsQnt"), - step1StaaExcpPrcsQnt: formatNumber(d.step1StaaExcpPrcsQnt, "step1StaaExcpPrcsQnt"), - step2StaaExcpPrcsQnt: formatNumber(d.step2StaaExcpPrcsQnt, "step2StaaExcpPrcsQnt"), - step3StaaExcpPrcsQnt: formatNumber(d.step3StaaExcpPrcsQnt, "step3StaaExcpPrcsQnt"), - step4StaaExcpPrcsQnt: formatNumber(d.step4StaaExcpPrcsQnt, "step4StaaExcpPrcsQnt"), - step5StaaExcpPrcsQnt: formatNumber(d.step5StaaExcpPrcsQnt, "step5StaaExcpPrcsQnt"), - step6StaaExcpPrcsQnt: formatNumber(d.step6StaaExcpPrcsQnt, "step6StaaExcpPrcsQnt"), - step7StaaExcpPrcsQnt: formatNumber(d.step7StaaExcpPrcsQnt, "step7StaaExcpPrcsQnt"), + frlvlStaaPrcqty: formatNumber(d.frlvlStaaPrcqty, "frlvlStaaPrcqty"), + sclvlStaaPrcqty: formatNumber(d.sclvlStaaPrcqty, "sclvlStaaPrcqty"), + thlvlStaaPrcqty: formatNumber(d.thlvlStaaPrcqty, "thlvlStaaPrcqty"), + folvlStaaPrcqty: formatNumber(d.folvlStaaPrcqty, "folvlStaaPrcqty"), + filvlStaaPrcqty: formatNumber(d.filvlStaaPrcqty, "filvlStaaPrcqty"), + sxlvlStaaPrcqty: formatNumber(d.sxlvlStaaPrcqty, "sxlvlStaaPrcqty"), + svlvlStaaPrcqty: formatNumber(d.svlvlStaaPrcqty, "svlvlStaaPrcqty"), + frlvlStaaOtsdPrcqty: formatNumber(d.frlvlStaaOtsdPrcqty, "frlvlStaaOtsdPrcqty"), + sclvlStaaOtsdPrcqty: formatNumber(d.sclvlStaaOtsdPrcqty, "sclvlStaaOtsdPrcqty"), + thlvlStaaOtsdPrcqty: formatNumber(d.thlvlStaaOtsdPrcqty, "thlvlStaaOtsdPrcqty"), + folvlStaaOtsdPrcqty: formatNumber(d.folvlStaaOtsdPrcqty, "folvlStaaOtsdPrcqty"), + filvlStaaOtsdPrcqty: formatNumber(d.filvlStaaOtsdPrcqty, "filvlStaaOtsdPrcqty"), + sxlvlStaaOtsdPrcqty: formatNumber(d.sxlvlStaaOtsdPrcqty, "sxlvlStaaOtsdPrcqty"), + svlvlStaaOtsdPrcqty: formatNumber(d.svlvlStaaOtsdPrcqty, "svlvlStaaOtsdPrcqty"), rmrk: nullableTrimmedString(d.rmrk), })); } @@ -236,34 +236,34 @@ function buildSepticTankStatusSaveList( return currentData.map((d) => ({ admdstCd: nullableTrimmedString(d.admdstCd), admdstNm: nullableTrimmedString(d.admdstNm), - staaInsdSttkNprsflCnt: formatNumber(d.staaInsdSttkNprsflCnt, "staaInsdSttkNprsflCnt"), - step1StaaInsdSttkFrcCnt: formatNumber(d.step1StaaInsdSttkFrcCnt, "step1StaaInsdSttkFrcCnt"), - staaInsdSprktpFltrtbCnt: formatNumber(d.staaInsdSprktpFltrtbCnt, "staaInsdSprktpFltrtbCnt"), - staaInsdAertMthdCnt: formatNumber(d.staaInsdAertMthdCnt, "staaInsdAertMthdCnt"), - staaInsdCntcAertCnt: formatNumber(d.staaInsdCntcAertCnt, "staaInsdCntcAertCnt"), + staaInsdSpctnkNatrCnt: formatNumber(d.staaInsdSpctnkNatrCnt, "staaInsdSpctnkNatrCnt"), + staaInsdSpctnkFrcCnt: formatNumber(d.staaInsdSpctnkFrcCnt, "staaInsdSpctnkFrcCnt"), + staaInsdSprklFiltrCnt: formatNumber(d.staaInsdSprklFiltrCnt, "staaInsdSprklFiltrCnt"), + staaInsdAirCnt: formatNumber(d.staaInsdAirCnt, "staaInsdAirCnt"), + staaInsdCntcAirCnt: formatNumber(d.staaInsdCntcAirCnt, "staaInsdCntcAirCnt"), staaInsdEtcCnt: formatNumber(d.staaInsdEtcCnt, "staaInsdEtcCnt"), - step1StaaInsdNope: formatNumber(d.step1StaaInsdNope, "step1StaaInsdNope"), - step2StaaInsdNope: formatNumber(d.step2StaaInsdNope, "step2StaaInsdNope"), - step3StaaInsdNope: formatNumber(d.step3StaaInsdNope, "step3StaaInsdNope"), - step4StaaInsdNope: formatNumber(d.step4StaaInsdNope, "step4StaaInsdNope"), - step5StaaInsdNope: formatNumber(d.step5StaaInsdNope, "step5StaaInsdNope"), - step6StaaInsdNope: formatNumber(d.step6StaaInsdNope, "step6StaaInsdNope"), - step7StaaInsdNope: formatNumber(d.step7StaaInsdNope, "step7StaaInsdNope"), - step8StaaInsdNope: formatNumber(d.step8StaaInsdNope, "step8StaaInsdNope"), - staaExcpSttkNprsflCnt: formatNumber(d.staaExcpSttkNprsflCnt, "staaExcpSttkNprsflCnt"), - step1StaaExcpSttkFrcCnt: formatNumber(d.step1StaaExcpSttkFrcCnt, "step1StaaExcpSttkFrcCnt"), - staaExcpSprktpFltrtbCnt: formatNumber(d.staaExcpSprktpFltrtbCnt, "staaExcpSprktpFltrtbCnt"), - staaExcpAertMthdCnt: formatNumber(d.staaExcpAertMthdCnt, "staaExcpAertMthdCnt"), - staaExcpCntcAertCnt: formatNumber(d.staaExcpCntcAertCnt, "staaExcpCntcAertCnt"), - staaExcpEtcCnt: formatNumber(d.staaExcpEtcCnt, "staaExcpEtcCnt"), - step1StaaExcpNope: formatNumber(d.step1StaaExcpNope, "step1StaaExcpNope"), - step2StaaExcpNope: formatNumber(d.step2StaaExcpNope, "step2StaaExcpNope"), - step3StaaExcpNope: formatNumber(d.step3StaaExcpNope, "step3StaaExcpNope"), - step4StaaExcpNope: formatNumber(d.step4StaaExcpNope, "step4StaaExcpNope"), - step5StaaExcpNope: formatNumber(d.step5StaaExcpNope, "step5StaaExcpNope"), - step6StaaExcpNope: formatNumber(d.step6StaaExcpNope, "step6StaaExcpNope"), - step7StaaExcpNope: formatNumber(d.step7StaaExcpNope, "step7StaaExcpNope"), - step8StaaExcpNope: formatNumber(d.step8StaaExcpNope, "step8StaaExcpNope"), + frlvlStaaInsdNope: formatNumber(d.frlvlStaaInsdNope, "frlvlStaaInsdNope"), + sclvlStaaInsdNope: formatNumber(d.sclvlStaaInsdNope, "sclvlStaaInsdNope"), + thlvlStaaInsdNope: formatNumber(d.thlvlStaaInsdNope, "thlvlStaaInsdNope"), + folvlStaaInsdNope: formatNumber(d.folvlStaaInsdNope, "folvlStaaInsdNope"), + filvlStaaInsdNope: formatNumber(d.filvlStaaInsdNope, "filvlStaaInsdNope"), + sxlvlStaaInsdNope: formatNumber(d.sxlvlStaaInsdNope, "sxlvlStaaInsdNope"), + svlvlStaaInsdNope: formatNumber(d.svlvlStaaInsdNope, "svlvlStaaInsdNope"), + eilvlStaaInsdNope: formatNumber(d.eilvlStaaInsdNope, "eilvlStaaInsdNope"), + staaOtsdSpctnkNatrCnt: formatNumber(d.staaOtsdSpctnkNatrCnt, "staaOtsdSpctnkNatrCnt"), + staaOtsdSpctnkFrcCnt: formatNumber(d.staaOtsdSpctnkFrcCnt, "staaOtsdSpctnkFrcCnt"), + staaOtsdSprklFiltrCnt: formatNumber(d.staaOtsdSprklFiltrCnt, "staaOtsdSprklFiltrCnt"), + staaOtsdAirCnt: formatNumber(d.staaOtsdAirCnt, "staaOtsdAirCnt"), + staaOtsdCntcAirCnt: formatNumber(d.staaOtsdCntcAirCnt, "staaOtsdCntcAirCnt"), + staaOtsdEtcCnt: formatNumber(d.staaOtsdEtcCnt, "staaOtsdEtcCnt"), + frlvlStaaOtsdNope: formatNumber(d.frlvlStaaOtsdNope, "frlvlStaaOtsdNope"), + sclvlStaaOtsdNope: formatNumber(d.sclvlStaaOtsdNope, "sclvlStaaOtsdNope"), + thlvlStaaOtsdNope: formatNumber(d.thlvlStaaOtsdNope, "thlvlStaaOtsdNope"), + folvlStaaOtsdNope: formatNumber(d.folvlStaaOtsdNope, "folvlStaaOtsdNope"), + filvlStaaOtsdNope: formatNumber(d.filvlStaaOtsdNope, "filvlStaaOtsdNope"), + sxlvlStaaOtsdNope: formatNumber(d.sxlvlStaaOtsdNope, "sxlvlStaaOtsdNope"), + svlvlStaaOtsdNope: formatNumber(d.svlvlStaaOtsdNope, "svlvlStaaOtsdNope"), + eilvlStaaOtsdNope: formatNumber(d.eilvlStaaOtsdNope, "eilvlStaaOtsdNope"), rmrk: nullableTrimmedString(d.rmrk), })); } @@ -278,13 +278,13 @@ function buildPrivateSewageDesigStatusSaveList( admdstNm: nullableTrimmedString(d.admdstNm), indvSwagePbancRgnCnt: formatNumber(d.indvSwagePbancRgnCnt, "indvSwagePbancRgnCnt"), indvSwageDsgnScpLen: formatNumber(d.indvSwageDsgnScpLen, "indvSwageDsgnScpLen"), - spctnkGrssFcltCnt: formatNumber(d.spctnkGrssFcltCnt, "spctnkGrssFcltCnt"), - spctnkQnt: formatNumber(d.spctnkQnt, "spctnkQnt"), - drtwPrcsFcltGrssFcltCnt: formatNumber( - d.drtwPrcsFcltGrssFcltCnt, - "drtwPrcsFcltGrssFcltCnt", + spctnkWholFcltCnt: formatNumber(d.spctnkWholFcltCnt, "spctnkWholFcltCnt"), + spctnkPrcqty: formatNumber(d.spctnkPrcqty, "spctnkPrcqty"), + swgdplFcltWholFcltCnt: formatNumber( + d.swgdplFcltWholFcltCnt, + "swgdplFcltWholFcltCnt", ), - drtwPrcsFcltQnt: formatNumber(d.drtwPrcsFcltQnt, "drtwPrcsFcltQnt"), + swgdplFcltPrcqty: formatNumber(d.swgdplFcltPrcqty, "swgdplFcltPrcqty"), rmrk: nullableTrimmedString(d.rmrk), })); } @@ -721,7 +721,7 @@ const PrivateSewageFacilityInp = () => { ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), ctpvNm: lastSearchedValues.sido ?? "", statsYr: lastSearchedValues.year ?? "", - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCdForTab, }; @@ -803,14 +803,14 @@ const PrivateSewageFacilityInp = () => { statsYr: lastSearchedValues.year ?? "", ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - laePicNm: submitInfo.laePicNm, - laePicTelNo: submitInfo.laePicTelNo, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, }; const verificationQuery = { @@ -840,7 +840,7 @@ const PrivateSewageFacilityInp = () => { if (isSewageTreatTab) { const param: SewageTreatFactStatusSubmitRequest = { ...submitInfoBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: buildSewageTreatFactStatusSaveList(currentData), ...adminOpt, }; @@ -851,7 +851,7 @@ const PrivateSewageFacilityInp = () => { } else if (isSepticTankTab) { const param: SepticTankStatusSubmitRequest = { ...submitInfoBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: buildSepticTankStatusSaveList(currentData), ...adminOpt, }; @@ -860,7 +860,7 @@ const PrivateSewageFacilityInp = () => { } else { const param: PrivateSewageDesigStatusSubmitRequest = { ...submitInfoBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: buildPrivateSewageDesigStatusSaveList(currentData), ...adminOpt, }; @@ -886,7 +886,7 @@ const PrivateSewageFacilityInp = () => { sewer_bzmn_cd: lastSearchedValues?.bsnmCd ?? "", stats_cd: statsCdForTab, stats_yr: lastSearchedValues.year ?? "", - lae_sbmsn_stts_cd: activeTabStatus?.laeSbmsnSttsCd === "4" ? "4" : "2", + lae_sbmsn_stts_cd: activeTabStatus?.lclgvSbmsnSttsCd === "4" ? "4" : "2", gen_verify_stts_cd: nvpassed ? "1" : "2", hb_pass_yn: response.data?.isHbPassed, }; @@ -982,7 +982,7 @@ const PrivateSewageFacilityInp = () => { if (isSewageTreatTab) { const param: SewageTreatFactStatusSaveRequest = { ...baseRequest, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: buildSewageTreatFactStatusSaveList(currentData), ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), }; @@ -1008,7 +1008,7 @@ const PrivateSewageFacilityInp = () => { if (isSepticTankTab) { const param: SepticTankStatusSaveRequest = { ...baseRequest, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: buildSepticTankStatusSaveList(currentData), ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), }; @@ -1031,7 +1031,7 @@ const PrivateSewageFacilityInp = () => { const param: PrivateSewageDesigStatusSaveRequest = { ...baseRequest, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: buildPrivateSewageDesigStatusSaveList(currentData), ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), }; @@ -1156,7 +1156,7 @@ const PrivateSewageFacilityInp = () => { : e.vrfcCd === "NV" ? "일반검증 - " : "모집단 검증 - "; - return `${prefix}${e.rsnExpln}(검증 기준값: ${e.compVlCn} / 현재 입력값: ${e.nowVlCn})`; + return `${prefix}${e.rsnExpln}(검증 기준값: ${e.cmprCn} / 현재 입력값: ${e.nowCn})`; }) .filter(Boolean) .join("\n"); @@ -1202,7 +1202,7 @@ const PrivateSewageFacilityInp = () => { {submitOk && } )} - {activeTabStatus?.laeSbmsnSttsCd === "2" && submitOk && ( + {activeTabStatus?.lclgvSbmsnSttsCd === "2" && submitOk && ( )} {showSaveInToolbar && } diff --git a/apps/st/src/components/statistics/input/PublicSewageFacilityInp.tsx b/apps/st/src/components/statistics/input/PublicSewageFacilityInp.tsx index b5e0b2a49..bcc35197e 100644 --- a/apps/st/src/components/statistics/input/PublicSewageFacilityInp.tsx +++ b/apps/st/src/components/statistics/input/PublicSewageFacilityInp.tsx @@ -1,4 +1,4 @@ -import { type Dispatch, type SetStateAction,useEffect, useRef, useState } from 'react'; +import { type Dispatch, type SetStateAction,useEffect, useRef, useState } from 'react'; import { useConfirm } from '@frontend-opensource/use-react-hooks'; @@ -89,8 +89,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (['2', '3'].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (['2', '3'].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -108,7 +108,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === '2'; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === '2'; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = isSubmitted && periodEnterable && gugunOk; @@ -397,16 +397,16 @@ const PublicSewageFacilityInp = () => { statsYr: lastSearchedValues.year ?? '', ctpvNm: lastSearchedValues.sido ?? '', ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, noApplicable, - laePicNm: submitInfo.laePicNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laePicTelNo: submitInfo.laePicTelNo, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, submitList, }; @@ -432,7 +432,7 @@ const PublicSewageFacilityInp = () => { sewer_bzmn_cd: lastSearchedValues?.bsnmCd ?? '', stats_cd: statsCdForTab, stats_yr: lastSearchedValues.year ?? '', - lae_sbmsn_stts_cd: activeTabStatus?.laeSbmsnSttsCd === '4' ? '4' : '2', + lae_sbmsn_stts_cd: activeTabStatus?.lclgvSbmsnSttsCd === '4' ? '4' : '2', gen_verify_stts_cd: nvpassed ? '1' : '2', hb_pass_yn: response.data?.isHbPassed, }; @@ -657,7 +657,7 @@ const PublicSewageFacilityInp = () => { statsYr: lastSearchedValues.year ?? '', ctpvNm: lastSearchedValues.sido ?? '', ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: 'superAdmin' } : {}), noApplicable, saveList, @@ -902,7 +902,7 @@ const PublicSewageFacilityInp = () => { statsYr: lastSearchedValues.year ?? '', ctpvNm: lastSearchedValues.sido ?? '', ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, }; const response = @@ -949,7 +949,7 @@ const PublicSewageFacilityInp = () => { admdstNm: draft.admdstNm, mainFcltSn: draft.mainFcltSn, mainFcltNm: draft.mainFcltNm, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: draft.saveList, deleteList: draft.deleteList, }; @@ -1128,7 +1128,7 @@ const PublicSewageFacilityInp = () => { ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), ctpvNm: lastSearchedValues?.sido ?? '', statsYr: lastSearchedValues?.year ?? '', - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCdForCancel, }; @@ -1203,15 +1203,17 @@ const PublicSewageFacilityInp = () => { alert('해당 시설은 중심처리시설의 위탁시설로 연결되어있습니다.'); } const mappedTargetRows = applyExclusiveSelfMappingChecks( - rawList.map((item) => ({ - ...item, - __checked: item.mappedYn === 'Y' ? 'Y' : '', - })), + toGridRows( + rawList.map((item) => ({ + ...item, + __checked: item.mappedYn === 'Y' ? 'Y' : '', + })), + ), fcltSn, ); setRowDataMap((prev) => { const next = new Map(prev); - next.set('MainFacilityTarget', toGridRows(mappedTargetRows)); + next.set('MainFacilityTarget', mappedTargetRows); return next; }); } catch { @@ -1321,7 +1323,7 @@ const PublicSewageFacilityInp = () => { {submitOk && } )} - {!isMainFacilityTab && activeTabStatus?.laeSbmsnSttsCd === '2' && submitOk && ( + {!isMainFacilityTab && activeTabStatus?.lclgvSbmsnSttsCd === '2' && submitOk && ( )} {showSaveInToolbar && } @@ -1577,8 +1579,8 @@ const PublicSewageFacilityInp = () => { .map((e) => { const prefix = e.vrfcCd === "IMR" ? "시계열 검증 - " : (e.vrfcCd === "NV" ? "일반검증 - " : "모집단 검증 - "); - const comp = e.compVlCn ?? ""; - const now = e.nowVlCn ?? ""; + const comp = e.cmprCn ?? ""; + const now = e.nowCn ?? ""; return `${prefix}${e.rsnExpln} (검증 기준값: ${comp} / 현재 입력값: ${now})`; }) diff --git a/apps/st/src/components/statistics/input/PumpingStationInp.tsx b/apps/st/src/components/statistics/input/PumpingStationInp.tsx index a85bd61dd..178c2e63a 100644 --- a/apps/st/src/components/statistics/input/PumpingStationInp.tsx +++ b/apps/st/src/components/statistics/input/PumpingStationInp.tsx @@ -93,8 +93,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (["2", "3"].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (["2", "3"].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -130,7 +130,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === "2"; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === "2"; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = @@ -252,34 +252,34 @@ function buildPumpingStationSaveItem( pumpSeNm: nullableTrimmedString(row.pumpSeNm), fcltPstnCn: nullableTrimmedString(row.fcltPstnCn), oprtngStrtYmd: toCompactYmdOrNull(row.oprtngStrtYmd), - planMltvArea: toGridNumber(row.planMltvArea), - sndyArea: toGridNumber(row.sndyArea), + planDrnar: toGridNumber(row.planDrnar), + icodwArea: toGridNumber(row.icodwArea), rainArea: toGridNumber(row.rainArea), - drtwPumpN1DmtrArea: toGridNumber(row.drtwPumpN1DmtrArea), + drtwPumpN1Dmtr: toGridNumber(row.drtwPumpN1Dmtr), drtwPumpN1Ppqty: toGridNumber(row.drtwPumpN1Ppqty), drtwPumpN1Cnt: toGridNumber(row.drtwPumpN1Cnt), drtwPumpN1RsrvCnt: toGridNumber(row.drtwPumpN1RsrvCnt), - drtwPumpN2DmtrArea: toGridNumber(row.drtwPumpN2DmtrArea), + drtwPumpN2Dmtr: toGridNumber(row.drtwPumpN2Dmtr), drtwPumpN2Ppqty: toGridNumber(row.drtwPumpN2Ppqty), drtwPumpN2Cnt: toGridNumber(row.drtwPumpN2Cnt), drtwPumpN2RsrvCnt: toGridNumber(row.drtwPumpN2RsrvCnt), - drtwPumpN3DmtrArea: toGridNumber(row.drtwPumpN3DmtrArea), + drtwPumpN3Dmtr: toGridNumber(row.drtwPumpN3Dmtr), drtwPumpN3Ppqty: toGridNumber(row.drtwPumpN3Ppqty), drtwPumpN3Cnt: toGridNumber(row.drtwPumpN3Cnt), drtwPumpN3RsrvCnt: toGridNumber(row.drtwPumpN3RsrvCnt), - exlnPumpN1DmtrArea: toGridNumber(row.exlnPumpN1DmtrArea), + exlnPumpN1Dmtr: toGridNumber(row.exlnPumpN1Dmtr), exlnPumpN1Ppqty: toGridNumber(row.exlnPumpN1Ppqty), exlnPumpN1Cnt: toGridNumber(row.exlnPumpN1Cnt), exlnPumpN1RsrvCnt: toGridNumber(row.exlnPumpN1RsrvCnt), - exlnPumpN2DmtrArea: toGridNumber(row.exlnPumpN2DmtrArea), + exlnPumpN2Dmtr: toGridNumber(row.exlnPumpN2Dmtr), exlnPumpN2Ppqty: toGridNumber(row.exlnPumpN2Ppqty), exlnPumpN2Cnt: toGridNumber(row.exlnPumpN2Cnt), exlnPumpN2RsrvCnt: toGridNumber(row.exlnPumpN2RsrvCnt), - exlnPumpN3DmtrArea: toGridNumber(row.exlnPumpN3DmtrArea), + exlnPumpN3Dmtr: toGridNumber(row.exlnPumpN3Dmtr), exlnPumpN3Ppqty: toGridNumber(row.exlnPumpN3Ppqty), exlnPumpN3Cnt: toGridNumber(row.exlnPumpN3Cnt), exlnPumpN3RsrvCnt: toGridNumber(row.exlnPumpN3RsrvCnt), - anlElpwrUseQnt: toGridNumber(row.anlElpwrUseQnt), + anlElpwrUsqty: toGridNumber(row.anlElpwrUsqty), rmrk: nullableTrimmedString(row.rmrk), }; } @@ -606,7 +606,7 @@ const PumpingStationInp = () => { ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), ctpvNm: lastSearchedValues.sido ?? "", statsYr: lastSearchedValues.year ?? "", - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCd || PUMPING_STATION_STATS_CD, }; @@ -691,7 +691,7 @@ const PumpingStationInp = () => { statsYr: lastSearchedValues.year ?? "", ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), noApplicable, saveList, @@ -759,15 +759,15 @@ const PumpingStationInp = () => { statsYr: lastSearchedValues.year ?? "", ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - userId: userInfo.userUnqId, - laePicNm: submitInfo.laePicNm, - laePicTelNo: submitInfo.laePicTelNo, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, + userUuid: userInfo.userUnqId, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), noApplicable, submitList, @@ -791,7 +791,7 @@ const PumpingStationInp = () => { stats_cd: statsCdForSubmit, stats_yr: lastSearchedValues.year ?? "", lae_sbmsn_stts_cd: - statusInfo?.laeSbmsnSttsCd === "4" ? "4" : "2", + statusInfo?.lclgvSbmsnSttsCd === "4" ? "4" : "2", gen_verify_stts_cd: nvpassed ? "1" : "2", hb_pass_yn: response.data?.isHbPassed, }; @@ -945,7 +945,7 @@ const PumpingStationInp = () => { ? "일반검증 - " : "모집단 검증 -"; return `${prefix}${e.rsnExpln} -(검증 기준값: ${e.compVlCn} / 현재 입력값: ${e.nowVlCn})`; +(검증 기준값: ${e.cmprCn} / 현재 입력값: ${e.nowCn})`; }) .filter(Boolean) .join("\n"); @@ -1027,7 +1027,7 @@ const PumpingStationInp = () => { {submitOk && } )} - {statusInfo?.laeSbmsnSttsCd === "2" && submitOk && ( + {statusInfo?.lclgvSbmsnSttsCd === "2" && submitOk && ( )} {showSaveInToolbar && } diff --git a/apps/st/src/components/statistics/input/SewageExcretaRelatedInp.tsx b/apps/st/src/components/statistics/input/SewageExcretaRelatedInp.tsx index a8d387577..e3d63fea7 100644 --- a/apps/st/src/components/statistics/input/SewageExcretaRelatedInp.tsx +++ b/apps/st/src/components/statistics/input/SewageExcretaRelatedInp.tsx @@ -16,6 +16,7 @@ import { statisticsApi } from "@/entities/statistics/api/statistics-service"; import type { ExcretaRelatedIndustrySaveItem, PrivateSewageTreatRelatedIndustrySaveItem, + PublicInstitutionExcretaIndustrySaveItem, PublicInstitutionSewerIndustrySaveItem, SewageExcretaRelatedRequestParams, SewageExcretaRelatedVerificationResult, @@ -157,8 +158,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (["2", "3"].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (["2", "3"].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -194,7 +195,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === "2"; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === "2"; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = isSubmitted && periodEnterable && gugunOk; @@ -238,10 +239,20 @@ function isCheckedRow(row: Record): boolean { type ArticleOgnzSnSet = Set; -function extractOgnzSnSet(rows: Record[]): ArticleOgnzSnSet { +const PUBLIC_INSTITUTION_OGNZ_SN_FIELD = "statsOgnzSn" as const; + +function getPublicInstitutionOgnzSn( + row: Record, +): string { + return String(row[PUBLIC_INSTITUTION_OGNZ_SN_FIELD] ?? "").trim(); +} + +function extractOgnzSnSet( + rows: Record[], +): ArticleOgnzSnSet { const set = new Set(); for (const row of rows) { - const ognzSn = String(row.ognzSn ?? "").trim(); + const ognzSn = getPublicInstitutionOgnzSn(row); if (ognzSn) set.add(ognzSn); } return set; @@ -277,7 +288,7 @@ function isPersistedPublicInstitutionArticleRow( ): boolean { if (!ARTICLE_EDIT_TAB_KEYS.has(tabKey)) return false; if (isNewArticleRow(row)) return false; - const ognzSn = String(row.ognzSn ?? "").trim(); + const ognzSn = getPublicInstitutionOgnzSn(row); if (!ognzSn) return false; if ((preYearRef.current.get(tabKey) ?? new Set()).has(ognzSn)) return false; return (persistedRef.current.get(tabKey) ?? new Set()).has(ognzSn); @@ -402,18 +413,18 @@ function toGridNumber(value: string | number | null | undefined): number { function buildPublicInstitutionIndustrySaveItem( row: Record, sggOptions: Sgg[], -): PublicInstitutionSewerIndustrySaveItem { +): PublicInstitutionSewerIndustrySaveItem | PublicInstitutionExcretaIndustrySaveItem { const { admdstCd, admdstNm } = resolvePublicInstitutionAdmdst(row, sggOptions); return { admdstCd, admdstNm, - ognzSn: nullableTrimmedString(row.ognzSn), + statsOgnzSn: nullableTrimmedString(row.statsOgnzSn), ognzNm: nullableTrimmedString(row.ognzNm), pbadmsNope: toGridNumber(row.pbadmsNope), engrkCnt: toGridNumber(row.engrkCnt), mchnCnt: toGridNumber(row.mchnCnt), prvtmCnt: toGridNumber(row.prvtmCnt), - chmengCnt: toGridNumber(row.chmengCnt), + chemCnt: toGridNumber(row.chemCnt), envCnt: toGridNumber(row.envCnt), enjbEtcCnt: toGridNumber(row.enjbEtcCnt), etcCnt: toGridNumber(row.etcCnt), @@ -430,9 +441,9 @@ function buildExcretaRelatedIndustrySaveItem( admdstNm: nullableTrimmedString(row.admdstNm), bzentyCnt: toGridNumber(row.bzentyCnt), empNope: toGridNumber(row.empNope), - n3TonUdrCnt: toGridNumber(row.n3TonUdrCnt), - n4TonUdrCnt: toGridNumber(row.n4TonUdrCnt), - n8TonUdrCnt: toGridNumber(row.n8TonUdrCnt), + frlvlTonUdrCnt: toGridNumber(row.frlvlTonUdrCnt), + sclvlTonUdrCnt: toGridNumber(row.sclvlTonUdrCnt), + thlvlTonUdrCnt: toGridNumber(row.thlvlTonUdrCnt), etcCnt: toGridNumber(row.etcCnt), clctCnvncPrfmncQnt: toGridNumber(row.clctCnvncPrfmncQnt), rmrk: nullableTrimmedString(row.rmrk), @@ -550,7 +561,7 @@ function verificationCellTooltip({ ? "일반검증 - " : "모집단 검증 - "; return `${prefix}${e.rsnExpln} -(검증 기준값: ${e.compVlCn} / 현재 입력값: ${e.nowVlCn})`; +(검증 기준값: ${e.cmprCn} / 현재 입력값: ${e.nowCn})`; }) .filter(Boolean) .join("\n"); @@ -1179,7 +1190,7 @@ const SewageExcretaRelatedInp = () => { ...toInputSearchRegion(sidoListRef.current, ctx), ctpvNm: ctx.sido ?? "", statsYr: ctx.year ?? "", - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCdForTab, }; @@ -1317,9 +1328,12 @@ const SewageExcretaRelatedInp = () => { let submitList: | PublicInstitutionSewerIndustrySaveItem[] + | PublicInstitutionExcretaIndustrySaveItem[] | ExcretaRelatedIndustrySaveItem[] | PrivateSewageTreatRelatedIndustrySaveItem[]; - let deleteList: PublicInstitutionSewerIndustrySaveItem[] = []; + let deleteList: + | PublicInstitutionSewerIndustrySaveItem[] + | PublicInstitutionExcretaIndustrySaveItem[] = []; let sggList: Sgg[] = []; if (isDistrictRowTab) { @@ -1351,7 +1365,7 @@ const SewageExcretaRelatedInp = () => { sggList = list; const rowsForSubmit = mergeGridRowsWithMapRows(currentData, mapRows, [ - "ognzSn", + PUBLIC_INSTITUTION_OGNZ_SN_FIELD, "admdstCd", "admdstNm", "__isNewArticle", @@ -1387,14 +1401,14 @@ const SewageExcretaRelatedInp = () => { const submitRequestBase = { ...searchContextBase, - laePicNm: submitInfo.laePicNm, - laePicTelNo: submitInfo.laePicTelNo, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, ...(isPublicInstitutionTab ? { noApplicable } : {}), ...(isAdminInfo ? { superAdmin: "superAdmin" as const } : {}), }; @@ -1437,14 +1451,14 @@ const SewageExcretaRelatedInp = () => { tabKey === ExcretaRelatedIndustryInpColumn.tabKey ? await statisticsInputSewageExcretaRelatedApi.submitExcretaRelatedIndustry({ ...submitRequestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: submitList as ExcretaRelatedIndustrySaveItem[], }) : tabKey === PrivateSewageTreatRelatedIndustryInpColumn.tabKey ? await statisticsInputSewageExcretaRelatedApi.submitPrivateSewageTreatRelatedIndustry( { ...submitRequestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: submitList as PrivateSewageTreatRelatedIndustrySaveItem[], }, @@ -1453,17 +1467,17 @@ const SewageExcretaRelatedInp = () => { ? await statisticsInputSewageExcretaRelatedApi.submitPublicInstitutionSewerIndustry( { ...submitRequestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: submitList as PublicInstitutionSewerIndustrySaveItem[], - deleteList, + deleteList: deleteList as PublicInstitutionSewerIndustrySaveItem[], }, ) : await statisticsInputSewageExcretaRelatedApi.submitPublicInstitutionExcretaIndustry( { ...submitRequestBase, - userId: userInfo.userUnqId, - submitList: submitList as PublicInstitutionSewerIndustrySaveItem[], - deleteList, + userUuid: userInfo.userUnqId, + submitList: submitList as PublicInstitutionExcretaIndustrySaveItem[], + deleteList: deleteList as PublicInstitutionExcretaIndustrySaveItem[], }, ); @@ -1484,7 +1498,7 @@ const SewageExcretaRelatedInp = () => { stats_cd: statsCdForTab, stats_yr: lastSearchedValues.year ?? "", lae_sbmsn_stts_cd: - activeTabStatus?.laeSbmsnSttsCd === "4" ? "4" : "2", + activeTabStatus?.lclgvSbmsnSttsCd === "4" ? "4" : "2", gen_verify_stts_cd: nvpassed ? "1" : "2", hb_pass_yn: response.data?.isHbPassed, }; @@ -1577,7 +1591,7 @@ const SewageExcretaRelatedInp = () => { setIsLoading(true); const userInfo = await getUserInfo(); const userFields = { - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" as const } : {}), }; @@ -1628,7 +1642,7 @@ const SewageExcretaRelatedInp = () => { sggList = list; const rowsForSave = mergeGridRowsWithMapRows(currentData, mapRows, [ - "ognzSn", + PUBLIC_INSTITUTION_OGNZ_SN_FIELD, "admdstCd", "admdstNm", "__isNewArticle", @@ -1661,16 +1675,16 @@ const SewageExcretaRelatedInp = () => { { ...baseSaveRequest, ...userFields, - saveList, - deleteList, + saveList: saveList as PublicInstitutionSewerIndustrySaveItem[], + deleteList: deleteList as PublicInstitutionSewerIndustrySaveItem[], }, ) : await statisticsInputSewageExcretaRelatedApi.savePublicInstitutionExcretaIndustry( { ...baseSaveRequest, ...userFields, - saveList, - deleteList, + saveList: saveList as PublicInstitutionExcretaIndustrySaveItem[], + deleteList: deleteList as PublicInstitutionExcretaIndustrySaveItem[], }, ); } else { @@ -2011,7 +2025,7 @@ const SewageExcretaRelatedInp = () => { {submitOk && } )} - {activeTabStatus?.laeSbmsnSttsCd === "2" && submitOk && ( + {activeTabStatus?.lclgvSbmsnSttsCd === "2" && submitOk && ( )} {showSaveInToolbar && } diff --git a/apps/st/src/components/statistics/input/SewageExcretaSlurgeInp.tsx b/apps/st/src/components/statistics/input/SewageExcretaSlurgeInp.tsx index 2aa1a1a14..924161636 100644 --- a/apps/st/src/components/statistics/input/SewageExcretaSlurgeInp.tsx +++ b/apps/st/src/components/statistics/input/SewageExcretaSlurgeInp.tsx @@ -157,7 +157,7 @@ function verificationCellTooltip({ ? "일반검증 - " : "모집단 검증 - "; return `${prefix}${e.rsnExpln} -(검증 기준값: ${e.compVlCn} / 현재 입력값: ${e.nowVlCn})`; +(검증 기준값: ${e.cmprCn} / 현재 입력값: ${e.nowCn})`; }) .filter(Boolean) .join("\n"); @@ -343,8 +343,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (["2", "3"].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (["2", "3"].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -380,7 +380,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === "2"; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === "2"; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = @@ -504,39 +504,39 @@ function buildSlurgeProcessingFacStatusSaveItem( otsdInflwQnt: toGridNumber(row.otsdInflwQnt), transfTmplntNm: nullableTrimmedString(row.transfTmplntNm), transfPrcsQnt: toGridNumber(row.transfPrcsQnt), - srpFncRt: toGridNumber(row.srpFncRt), - itslfTs1RclmQnt: toGridNumber(row.itslfTs1RclmQnt), - itslfTs1IncnrQnt: toGridNumber(row.itslfTs1IncnrQnt), - itslfTs1AltdQnt: toGridNumber(row.itslfTs1AltdQnt), - itslfTs1DryQnt: toGridNumber(row.itslfTs1DryQnt), - itslfTs1FuelQnt: toGridNumber(row.itslfTs1FuelQnt), - itslfTs1CmpstgQnt: toGridNumber(row.itslfTs1CmpstgQnt), + sludgeFncRt: toGridNumber(row.sludgeFncRt), + itslfFrlvlRclmQnt: toGridNumber(row.itslfFrlvlRclmQnt), + itslfFrlvlIncnrQnt: toGridNumber(row.itslfFrlvlIncnrQnt), + itslfFrlvlSldQnt: toGridNumber(row.itslfFrlvlSldQnt), + itslfFrlvlDryQnt: toGridNumber(row.itslfFrlvlDryQnt), + itslfFrlvlCrbnQnt: toGridNumber(row.itslfFrlvlCrbnQnt), + itslfFrlvlCmpstgQnt: toGridNumber(row.itslfFrlvlCmpstgQnt), cmpsPrcsFcltBzentyNm: nullableTrimmedString(row.cmpsPrcsFcltBzentyNm), incnrPrcsLfvlm: toGridNumber(row.incnrPrcsLfvlm), incnrPrcsPrdctRmtrlQnt: toGridNumber(row.incnrPrcsPrdctRmtrlQnt), - incnrPrcsFmlyrQnt: toGridNumber(row.incnrPrcsFmlyrQnt), + incnrPrcsCwthQnt: toGridNumber(row.incnrPrcsCwthQnt), incnrPrcsFcltNm: nullableTrimmedString(row.incnrPrcsFcltNm), - stbznPrcsLfvlm: toGridNumber(row.stbznPrcsLfvlm), - stbznPrcsFmlyrQnt: toGridNumber(row.stbznPrcsFmlyrQnt), - stbznPrcsFcltNm: nullableTrimmedString(row.stbznPrcsFcltNm), + sldPrcsLfvlm: toGridNumber(row.sldPrcsLfvlm), + sldPrcsCwthQnt: toGridNumber(row.sldPrcsCwthQnt), + sldPrcsFcltNm: nullableTrimmedString(row.sldPrcsFcltNm), dryPrcsLfvlm: toGridNumber(row.dryPrcsLfvlm), dryPrcsIncnrQnt: toGridNumber(row.dryPrcsIncnrQnt), dryPrcsFuelQnt: toGridNumber(row.dryPrcsFuelQnt), dryPrcsPrdctRmtrlQnt: toGridNumber(row.dryPrcsPrdctRmtrlQnt), - dryPrcsFmlyrQnt: toGridNumber(row.dryPrcsFmlyrQnt), + dryPrcsCwthQnt: toGridNumber(row.dryPrcsCwthQnt), dryPrcsCmpstgQnt: toGridNumber(row.dryPrcsCmpstgQnt), dryPrcsFcltNm: nullableTrimmedString(row.dryPrcsFcltNm), - fuelPrcsIncnrQnt: toGridNumber(row.fuelPrcsIncnrQnt), - fuelPrcsFuelQnt: toGridNumber(row.fuelPrcsFuelQnt), - fuelPrcsFcltNm: nullableTrimmedString(row.fuelPrcsFcltNm), + crbnPrcsIncnrQnt: toGridNumber(row.crbnPrcsIncnrQnt), + crbnPrcsFuelQnt: toGridNumber(row.crbnPrcsFuelQnt), + crbnPrcsFcltNm: nullableTrimmedString(row.crbnPrcsFcltNm), otsdCnsgnRclmQnt: toGridNumber(row.otsdCnsgnRclmQnt), otsdCnsgnIncnrQnt: toGridNumber(row.otsdCnsgnIncnrQnt), - otsdCnsgnFuelPwplQnt: toGridNumber(row.otsdCnsgnFuelPwplQnt), + otsdCnsgnPwplQnt: toGridNumber(row.otsdCnsgnPwplQnt), otsdCnsgnPrdctRmtrlQnt: toGridNumber(row.otsdCnsgnPrdctRmtrlQnt), - otsdCnsgnFmlyrQnt: toGridNumber(row.otsdCnsgnFmlyrQnt), + otsdCnsgnCwthQnt: toGridNumber(row.otsdCnsgnCwthQnt), otsdCnsgnCmpstgQnt: toGridNumber(row.otsdCnsgnCmpstgQnt), otsdCnsgnFcltNm: nullableTrimmedString(row.otsdCnsgnFcltNm), - cparTs1Whol: toGridNumber(row.cparTs1Whol), + cparFrlvlWholQnt: toGridNumber(row.cparFrlvlWholQnt), rmrk: nullableTrimmedString(row.rmrk), }; } @@ -553,23 +553,23 @@ function buildDigestorOperatingStatusSaveItem( swtrmtFcltCd: nullableTrimmedString(row.swtrmtFcltCd), swtrmtFcltNm: nullableTrimmedString(row.swtrmtFcltNm), fcltSn: nullableTrimmedString(row.fcltSn), - digstnEnYn: nullableTrimmedString(row.digstnEnYn), + gasPrcsEnYn: nullableTrimmedString(row.gasPrcsEnYn), }; if (isDigestorOperatingRowDisabled(row)) { return { ...base, - digstnEnYn: "N", - digstnCpct: 0, + gasPrcsEnYn: "N", + gasPrcsCpct: 0, actlDrvnCpct: 0, - digstnGasInputQnt: 0, - digstnGasInputSldDnst: 0, - digstnTnkOprtngDayCnt: 0, + prcsGasInputQnt: 0, + prcsGasInputSldDnst: 0, + prcsRepoOprtngDayCnt: 0, ocrnGasQnt: 0, - digstnGasUtztnNtslQnt: 0, - digstnGasUtztnEtgtQnt: 0, - digstnGasUtztnItslfQnt: 0, - digstnGasUtztnEtcQnt: 0, + prcsGasUtztnNtslQnt: 0, + prcsGasUtztnEtgtQnt: 0, + prcsGasUtztnItslfQnt: 0, + prcsGasUtztnEtcQnt: 0, surplsGasQnt: 0, rmrk: null, }; @@ -577,16 +577,16 @@ function buildDigestorOperatingStatusSaveItem( return { ...base, - digstnCpct: toGridNumber(row.digstnCpct), + gasPrcsCpct: toGridNumber(row.gasPrcsCpct), actlDrvnCpct: toGridNumber(row.actlDrvnCpct), - digstnGasInputQnt: toGridNumber(row.digstnGasInputQnt), - digstnGasInputSldDnst: toGridNumber(row.digstnGasInputSldDnst), - digstnTnkOprtngDayCnt: toGridNumber(row.digstnTnkOprtngDayCnt), + prcsGasInputQnt: toGridNumber(row.prcsGasInputQnt), + prcsGasInputSldDnst: toGridNumber(row.prcsGasInputSldDnst), + prcsRepoOprtngDayCnt: toGridNumber(row.prcsRepoOprtngDayCnt), ocrnGasQnt: toGridNumber(row.ocrnGasQnt), - digstnGasUtztnNtslQnt: toGridNumber(row.digstnGasUtztnNtslQnt), - digstnGasUtztnEtgtQnt: toGridNumber(row.digstnGasUtztnEtgtQnt), - digstnGasUtztnItslfQnt: toGridNumber(row.digstnGasUtztnItslfQnt), - digstnGasUtztnEtcQnt: toGridNumber(row.digstnGasUtztnEtcQnt), + prcsGasUtztnNtslQnt: toGridNumber(row.prcsGasUtztnNtslQnt), + prcsGasUtztnEtgtQnt: toGridNumber(row.prcsGasUtztnEtgtQnt), + prcsGasUtztnItslfQnt: toGridNumber(row.prcsGasUtztnItslfQnt), + prcsGasUtztnEtcQnt: toGridNumber(row.prcsGasUtztnEtcQnt), surplsGasQnt: toGridNumber(row.surplsGasQnt), rmrk: nullableTrimmedString(row.rmrk), }; @@ -604,10 +604,10 @@ function buildSewageSlurgeProcessingFacStatusSaveItem( fcltSn: nullableTrimmedString(row.fcltSn), fcltNm: nullableTrimmedString(row.fcltNm), prcsMthExpln: nullableTrimmedString(row.prcsMthExpln), - fcltCpct: toGridNumber(row.fcltCpct), + sludgeFcltCpct: toGridNumber(row.sludgeFcltCpct), anlPrcsQnt: toGridNumber(row.anlPrcsQnt), - dayAvgOprtngHr: toGridNumber(row.dayAvgOprtngHr), - anlOprtngDayCnt: toGridNumber(row.anlOprtngDayCnt), + dyrgOprtngHr: toGridNumber(row.dyrgOprtngHr), + fcltAnlOprtngDayCnt: toGridNumber(row.fcltAnlOprtngDayCnt), rmrk: nullableTrimmedString(row.rmrk), }; } @@ -630,7 +630,7 @@ function buildExcretaSlurgeProcessingStatusSaveItem( oceanInputQnt: toGridNumber(row.oceanInputQnt), fuelQnt: toGridNumber(row.fuelQnt), etcQnt: toGridNumber(row.etcQnt), - nondspsQnt: toGridNumber(row.nondspsQnt), + unprcsQnt: toGridNumber(row.unprcsQnt), swtrmtFcltNm: nullableTrimmedString(row.swtrmtFcltNm), rmrk: nullableTrimmedString(row.rmrk), }; @@ -1423,15 +1423,15 @@ const SewageExcretaSlurgeInp = () => { statsYr: lastSearchedValues.year ?? "", ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - userId: "", - laePicNm: submitInfo.laePicNm, - laePicTelNo: submitInfo.laePicTelNo, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, + userUuid: "", + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, ...(isAdminInfo ? { superAdmin: "superAdmin" as const } : {}), noApplicable, }; @@ -1443,21 +1443,21 @@ const SewageExcretaSlurgeInp = () => { const response = isSlurgeFacTab ? await statisticsInputSewageExcretaSlurgeApi.submitSlurgeProcessingFacStatus({ ...submitRequestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: slurgeSubmitList, deleteList: slurgeDeleteList, }) : isDigestorTab ? await statisticsInputSewageExcretaSlurgeApi.submitDigestorOperatingStatus({ ...submitRequestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: digestorSubmitList, }) : isSewageSlurgeFacTab ? await statisticsInputSewageExcretaSlurgeApi.submitSewageSlurgeProcessingFacStatus( { ...submitRequestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: sewageSlurgeFacSubmitList, deleteList: sewageSlurgeFacDeleteList, }, @@ -1465,7 +1465,7 @@ const SewageExcretaSlurgeInp = () => { : await statisticsInputSewageExcretaSlurgeApi.submitExcretaSlurgeProcessingStatus( { ...submitRequestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: excretaSlurgeSubmitList, }, ); @@ -1487,7 +1487,7 @@ const SewageExcretaSlurgeInp = () => { stats_cd: statsCdForSubmit, stats_yr: lastSearchedValues.year ?? "", lae_sbmsn_stts_cd: - activeTabStatus?.laeSbmsnSttsCd === "4" ? "4" : "2", + activeTabStatus?.lclgvSbmsnSttsCd === "4" ? "4" : "2", gen_verify_stts_cd: nvpassed ? "1" : "2", hb_pass_yn: response.data?.isHbPassed, }; @@ -1564,7 +1564,7 @@ const SewageExcretaSlurgeInp = () => { ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), ctpvNm: lastSearchedValues.sido ?? "", statsYr: lastSearchedValues.year ?? "", - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCdForTab, }; @@ -1636,7 +1636,7 @@ const SewageExcretaSlurgeInp = () => { setIsLoading(true); const userInfo = await getUserInfo(); const userFields = { - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" as const } : {}), }; @@ -2109,7 +2109,7 @@ const SewageExcretaSlurgeInp = () => { {submitOk && } )} - {activeTabStatus?.laeSbmsnSttsCd === "2" && submitOk && ( + {activeTabStatus?.lclgvSbmsnSttsCd === "2" && submitOk && ( )} {showSaveInToolbar && } diff --git a/apps/st/src/components/statistics/input/SewagePipeInp.tsx b/apps/st/src/components/statistics/input/SewagePipeInp.tsx index 817c63d93..e4a39bec7 100644 --- a/apps/st/src/components/statistics/input/SewagePipeInp.tsx +++ b/apps/st/src/components/statistics/input/SewagePipeInp.tsx @@ -91,8 +91,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (["2", "3"].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (["2", "3"].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -242,6 +242,7 @@ function normalizePipeTypeStatusRow( lyngPrlgWhol, dmltnPrlgWhol, verificationResult, + rmrk, ...rest } = row; const yearFields: Record = {}; @@ -256,7 +257,7 @@ function normalizePipeTypeStatusRow( if (!Number.isFinite(year)) continue; const targetYear = Math.min(lastDataYear, Math.max(1995, year)); yearFields[`y${targetYear}PrlgWhol`] = - (yearFields[`y${targetYear}PrlgWhol`] ?? 0) + Number(y.prlgWhol ?? 0); + (yearFields[`y${targetYear}PrlgWhol`] ?? 0) + Number(y.pipeWholPrlg ?? 0); yearFields[`y${targetYear}LyngPrlg`] = (yearFields[`y${targetYear}LyngPrlg`] ?? 0) + Number(y.lyngPrlg ?? 0); yearFields[`y${targetYear}DmltnPrlg`] = @@ -266,8 +267,9 @@ function normalizePipeTypeStatusRow( return { ctpvNm, ...rest, - lyngPrlg: Number(row.lyngPrlg ?? lyngPrlgWhol ?? 0), - dmltnPrlg: Number(row.dmltnPrlg ?? dmltnPrlgWhol ?? 0), + rmrk: rmrk ?? "", + lyngPrlg: Number(lyngPrlgWhol ?? 0), + dmltnPrlg: Number(dmltnPrlgWhol ?? 0), ...yearFields, verificationResult: remapPipeTypePrlgWholVerification(verificationResult) ?? undefined, }; @@ -341,29 +343,29 @@ function buildRegionalFactSubmitListFromGrid( cbsysPplMtncPlanPrlg: formatNumber(d.cbsysPplMtncPlanPrlg, "cbsysPplMtncPlanPrlg"), cbsysPlanPrlg: formatNumber(d.cbsysPlanPrlg, "cbsysPlanPrlg"), cbsysFcltPrlg: formatNumber(d.cbsysFcltPrlg, "cbsysFcltPrlg"), - cbsysSqrePrlg: formatNumber(d.cbsysSqrePrlg, "cbsysSqrePrlg"), - cbsysCiclPrlg: formatNumber(d.cbsysCiclPrlg, "cbsysCiclPrlg"), + cbsysShpPrlg: formatNumber(d.cbsysShpPrlg, "cbsysShpPrlg"), + cbsysElpsdPrlg: formatNumber(d.cbsysElpsdPrlg, "cbsysElpsdPrlg"), cbsysOpnPrlg: formatNumber(d.cbsysOpnPrlg, "cbsysOpnPrlg"), - cbsysGttrPrlg: formatNumber(d.cbsysGttrPrlg, "cbsysGttrPrlg"), + cbsysLaditPrlg: formatNumber(d.cbsysLaditPrlg, "cbsysLaditPrlg"), drtwPplMtncPlanArea: formatNumber(d.drtwPplMtncPlanArea, "drtwPplMtncPlanArea"), drtwPplMtncPlanPrlg: formatNumber(d.drtwPplMtncPlanPrlg, "drtwPplMtncPlanPrlg"), drtwPplPlanPrlg: formatNumber(d.drtwPplPlanPrlg, "drtwPplPlanPrlg"), drtwPplFcltPrlg: formatNumber(d.drtwPplFcltPrlg, "drtwPplFcltPrlg"), - drtwPplSqrePrlg: formatNumber(d.drtwPplSqrePrlg, "drtwPplSqrePrlg"), - drtwPplCiclPrlg: formatNumber(d.drtwPplCiclPrlg, "drtwPplCiclPrlg"), + drtwPplShpPrlg: formatNumber(d.drtwPplShpPrlg, "drtwPplShpPrlg"), + drtwPplElpsdPrlg: formatNumber(d.drtwPplElpsdPrlg, "drtwPplElpsdPrlg"), exlnPplMtncPlanArea: formatNumber(d.exlnPplMtncPlanArea, "exlnPplMtncPlanArea"), exlnPplMtncPlanPrlg: formatNumber(d.exlnPplMtncPlanPrlg, "exlnPplMtncPlanPrlg"), exlnPplPlanPrlg: formatNumber(d.exlnPplPlanPrlg, "exlnPplPlanPrlg"), exlnPplFcltPrlg: formatNumber(d.exlnPplFcltPrlg, "exlnPplFcltPrlg"), - exlnPplSqrePrlg: formatNumber(d.exlnPplSqrePrlg, "exlnPplSqrePrlg"), - exlnPplCiclPrlg: formatNumber(d.exlnPplCiclPrlg, "exlnPplCiclPrlg"), + exlnPplShpPrlg: formatNumber(d.exlnPplShpPrlg, "exlnPplShpPrlg"), + exlnPplElpsdPrlg: formatNumber(d.exlnPplElpsdPrlg, "exlnPplElpsdPrlg"), exlnPplOpnPrlg: formatNumber(d.exlnPplOpnPrlg, "exlnPplOpnPrlg"), - exlnPplGttrPrlg: formatNumber(d.exlnPplGttrPrlg, "exlnPplGttrPrlg"), + exlnPplLaditPrlg: formatNumber(d.exlnPplLaditPrlg, "exlnPplLaditPrlg"), cbsysMnhlCnt: formatNumber(d.cbsysMnhlCnt, "cbsysMnhlCnt"), sprsysDrtwMnhlCnt: formatNumber(d.sprsysDrtwMnhlCnt, "sprsysDrtwMnhlCnt"), sprsysExlnMnhlCnt: formatNumber(d.sprsysExlnMnhlCnt, "sprsysExlnMnhlCnt"), - drtwRcvprpCnt: formatNumber(d.drtwRcvprpCnt, "drtwRcvprpCnt"), - exlnRcvprpCnt: formatNumber(d.exlnRcvprpCnt, "exlnRcvprpCnt"), + drtwDrgCnt: formatNumber(d.drtwDrgCnt, "drtwDrgCnt"), + exlnDrgCnt: formatNumber(d.exlnDrgCnt, "exlnDrgCnt"), stofcbrCnt: formatNumber(d.stofcbrCnt, "stofcbrCnt"), exlnOtflCnt: formatNumber(d.exlnOtflCnt, "exlnOtflCnt"), sewerLdgrEdpPrlg: formatNumber(d.sewerLdgrEdpPrlg, "sewerLdgrEdpPrlg"), @@ -419,7 +421,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === "2"; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === "2"; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = isSubmitted && periodEnterable && gugunOk; @@ -1109,7 +1111,7 @@ const SewagePipeInp = () => { ...toInputSearchRegion(sidoListRef.current, searchValues), ctpvNm: searchValues?.sido ?? "", statsYr: searchValues?.year ?? "", - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, statsCd: statsCdForTab, }; @@ -1191,15 +1193,15 @@ const SewagePipeInp = () => { statsYr: values.year ?? "", ctpvNm: values.sido ?? "", ...toInputSearchRegion(sidoListRef.current, values), - userId: userInfo.userUnqId, - laePicNm: submitInfo.laePicNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laePicTelNo: submitInfo.laePicTelNo, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, + userUuid: userInfo.userUnqId, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, }; let response: SeweragePipeInputSubmitResponse | null = null; @@ -1250,14 +1252,14 @@ const SewagePipeInp = () => { swtrmtFcltCd: nullableTrimmedString(d.swtrmtFcltCd), swtrmtFcltNm: nullableTrimmedString(d.swtrmtFcltNm), prcsZoneArea: formatNumber(d.prcsZoneArea, "prcsZoneArea"), - cbsysPrcsZoneArea: formatNumber(d.cbsysPrcsZoneArea, "cbsysPrcsZoneArea"), - sprsysPrcsZoneArea: formatNumber(d.sprsysPrcsZoneArea, "sprsysPrcsZoneArea"), + cbsysTrtznArea: formatNumber(d.cbsysTrtznArea, "cbsysTrtznArea"), + sprsysTrtznArea: formatNumber(d.sprsysTrtznArea, "sprsysTrtznArea"), sprsysVartnRt: formatNumber(d.sprsysVartnRt, "sprsysVartnRt"), - mltvEqpmCnt: formatNumber(d.mltvEqpmCnt, "mltvEqpmCnt"), - cbsysMltvEqpmCnt: formatNumber(d.cbsysMltvEqpmCnt, "cbsysMltvEqpmCnt"), - sprsysMltvEqpmCnt: formatNumber(d.sprsysMltvEqpmCnt, "sprsysMltvEqpmCnt"), - sprsysMltvLnkgCnt: formatNumber(d.sprsysMltvLnkgCnt, "sprsysMltvLnkgCnt"), - sprsysMltvYetLnkgCnt: formatNumber(d.sprsysMltvYetLnkgCnt, "sprsysMltvYetLnkgCnt"), + wholDrgCnt: formatNumber(d.wholDrgCnt, "wholDrgCnt"), + cbsysDrgCnt: formatNumber(d.cbsysDrgCnt, "cbsysDrgCnt"), + sprsysDrgCnt: formatNumber(d.sprsysDrgCnt, "sprsysDrgCnt"), + sprsysDrgLnkgCnt: formatNumber(d.sprsysDrgLnkgCnt, "sprsysDrgLnkgCnt"), + sprsysDrgNoinsLnkgCnt: formatNumber(d.sprsysDrgNoinsLnkgCnt, "sprsysDrgNoinsLnkgCnt"), wholFcltPrlg: formatNumber(d.wholFcltPrlg, "wholFcltPrlg"), wholIcptgAtlfcsPrlg: formatNumber(d.wholIcptgAtlfcsPrlg, "wholIcptgAtlfcsPrlg"), icptgPrlg: formatNumber(d.icptgPrlg, "icptgPrlg"), @@ -1265,10 +1267,10 @@ const SewagePipeInp = () => { cbsysStofcbrCnt: formatNumber(d.cbsysStofcbrCnt, "cbsysStofcbrCnt"), sprsysStofcbrCnt: formatNumber(d.sprsysStofcbrCnt, "sprsysStofcbrCnt"), sprsysExlnOtflCnt: formatNumber(d.sprsysExlnOtflCnt, "sprsysExlnOtflCnt"), - wholBrchlnPrlg: formatNumber(d.wholBrchlnPrlg, "wholBrchlnPrlg"), - cbsysBrchlnPrlg: formatNumber(d.cbsysBrchlnPrlg, "cbsysBrchlnPrlg"), - exlnBrchlnPrlg: formatNumber(d.exlnBrchlnPrlg, "exlnBrchlnPrlg"), - drtwBrchlnPrlg: formatNumber(d.drtwBrchlnPrlg, "drtwBrchlnPrlg"), + wholPplPrlg: formatNumber(d.wholPplPrlg, "wholPplPrlg"), + cbsysPplPrlg: formatNumber(d.cbsysPplPrlg, "cbsysPplPrlg"), + exlnPplPrlg: formatNumber(d.exlnPplPrlg, "exlnPplPrlg"), + drtwPplPrlg: formatNumber(d.drtwPplPrlg, "drtwPplPrlg"), rmrk: nullableTrimmedString(d.rmrk), })); const requestData: SeweragePipeInputFactInstallStatusSubmitRequest = { @@ -1309,7 +1311,7 @@ const SewagePipeInp = () => { lyngYr: String(year), lyngPrlg: formatNumber(d[lyngKey] as string | number | undefined, lyngKey), dmltnPrlg: formatNumber(d[dmltnKey] as string | number | undefined, dmltnKey), - prlgWhol: formatNumber(d[wholKey] as string | number | undefined, wholKey), + pipeWholPrlg: formatNumber(d[wholKey] as string | number | undefined, wholKey), }); } return { @@ -1352,15 +1354,15 @@ const SewagePipeInp = () => { }; const submitList = currentData.map((d) => ({ pipeSeCd: nullableTrimmedString(d.pipeSeCd), - step1PdmtPrlg: formatNumber(d.step1PdmtPrlg, "step1PdmtPrlg"), - step2PdmtPrlg: formatNumber(d.step2PdmtPrlg, "step2PdmtPrlg"), - step3PdmtPrlg: formatNumber(d.step3PdmtPrlg, "step3PdmtPrlg"), - step4PdmtPrlg: formatNumber(d.step4PdmtPrlg, "step4PdmtPrlg"), - step5PdmtPrlg: formatNumber(d.step5PdmtPrlg, "step5PdmtPrlg"), - sqrePdmtPrlg: formatNumber(d.sqrePdmtPrlg, "sqrePdmtPrlg"), + frlvlPdmtPrlg: formatNumber(d.frlvlPdmtPrlg, "frlvlPdmtPrlg"), + sclvlPdmtPrlg: formatNumber(d.sclvlPdmtPrlg, "sclvlPdmtPrlg"), + thlvlPdmtPrlg: formatNumber(d.thlvlPdmtPrlg, "thlvlPdmtPrlg"), + folvlPdmtPrlg: formatNumber(d.folvlPdmtPrlg, "folvlPdmtPrlg"), + filvlPdmtPrlg: formatNumber(d.filvlPdmtPrlg, "filvlPdmtPrlg"), + shpPdmtPrlg: formatNumber(d.shpPdmtPrlg, "shpPdmtPrlg"), etcPdmtPrlg: formatNumber(d.etcPdmtPrlg, "etcPdmtPrlg"), rmrk: nullableTrimmedString(d.rmrk), - pdmtByTsmWhol: formatNumber(d.pdmtByTsmWhol, "pdmtByTsmWhol"), + pdmtSeWholPrlg: formatNumber(d.pdmtSeWholPrlg, "pdmtSeWholPrlg"), admdstCd: nullableTrimmedString(d.admdstCd), admdstNm: nullableTrimmedString(d.admdstNm), })); @@ -1431,7 +1433,7 @@ const SewagePipeInp = () => { sewer_bzmn_cd: values?.bsnmCd ?? '', stats_cd: statsCdForTab, stats_yr: values.year ?? "", - lae_sbmsn_stts_cd: statusForTab?.laeSbmsnSttsCd === "4" ? "4" : "2", + lae_sbmsn_stts_cd: statusForTab?.lclgvSbmsnSttsCd === "4" ? "4" : "2", gen_verify_stts_cd: nvpassed ? "1" : "2", hb_pass_yn: response.data?.isHbPassed, }; @@ -1533,7 +1535,7 @@ const SewagePipeInp = () => { ...toInputSearchRegion(sidoListRef.current, searchValues), ctpvNm: searchValues?.sido ?? '', statsYr: searchValues?.year ?? '', - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: tabStatsCdMap.get(activeTab) ?? statsCd, }; @@ -1628,29 +1630,29 @@ const SewagePipeInp = () => { cbsysPplMtncPlanPrlg: formatNumber(d.cbsysPplMtncPlanPrlg, "cbsysPplMtncPlanPrlg"), cbsysPlanPrlg: formatNumber(d.cbsysPlanPrlg, "cbsysPlanPrlg"), cbsysFcltPrlg: formatNumber(d.cbsysFcltPrlg, "cbsysFcltPrlg"), - cbsysSqrePrlg: formatNumber(d.cbsysSqrePrlg, "cbsysSqrePrlg"), - cbsysCiclPrlg: formatNumber(d.cbsysCiclPrlg, "cbsysCiclPrlg"), + cbsysShpPrlg: formatNumber(d.cbsysShpPrlg, "cbsysShpPrlg"), + cbsysElpsdPrlg: formatNumber(d.cbsysElpsdPrlg, "cbsysElpsdPrlg"), cbsysOpnPrlg: formatNumber(d.cbsysOpnPrlg, "cbsysOpnPrlg"), - cbsysGttrPrlg: formatNumber(d.cbsysGttrPrlg, "cbsysGttrPrlg"), + cbsysLaditPrlg: formatNumber(d.cbsysLaditPrlg, "cbsysLaditPrlg"), drtwPplMtncPlanArea: formatNumber(d.drtwPplMtncPlanArea, "drtwPplMtncPlanArea"), drtwPplMtncPlanPrlg: formatNumber(d.drtwPplMtncPlanPrlg, "drtwPplMtncPlanPrlg"), drtwPplPlanPrlg: formatNumber(d.drtwPplPlanPrlg, "drtwPplPlanPrlg"), drtwPplFcltPrlg: formatNumber(d.drtwPplFcltPrlg, "drtwPplFcltPrlg"), - drtwPplSqrePrlg: formatNumber(d.drtwPplSqrePrlg, "drtwPplSqrePrlg"), - drtwPplCiclPrlg: formatNumber(d.drtwPplCiclPrlg, "drtwPplCiclPrlg"), + drtwPplShpPrlg: formatNumber(d.drtwPplShpPrlg, "drtwPplShpPrlg"), + drtwPplElpsdPrlg: formatNumber(d.drtwPplElpsdPrlg, "drtwPplElpsdPrlg"), exlnPplMtncPlanArea: formatNumber(d.exlnPplMtncPlanArea, "exlnPplMtncPlanArea"), exlnPplMtncPlanPrlg: formatNumber(d.exlnPplMtncPlanPrlg, "exlnPplMtncPlanPrlg"), exlnPplPlanPrlg: formatNumber(d.exlnPplPlanPrlg, "exlnPplPlanPrlg"), exlnPplFcltPrlg: formatNumber(d.exlnPplFcltPrlg, "exlnPplFcltPrlg"), - exlnPplSqrePrlg: formatNumber(d.exlnPplSqrePrlg, "exlnPplSqrePrlg"), - exlnPplCiclPrlg: formatNumber(d.exlnPplCiclPrlg, "exlnPplCiclPrlg"), + exlnPplShpPrlg: formatNumber(d.exlnPplShpPrlg, "exlnPplShpPrlg"), + exlnPplElpsdPrlg: formatNumber(d.exlnPplElpsdPrlg, "exlnPplElpsdPrlg"), exlnPplOpnPrlg: formatNumber(d.exlnPplOpnPrlg, "exlnPplOpnPrlg"), - exlnPplGttrPrlg: formatNumber(d.exlnPplGttrPrlg, "exlnPplGttrPrlg"), + exlnPplLaditPrlg: formatNumber(d.exlnPplLaditPrlg, "exlnPplLaditPrlg"), cbsysMnhlCnt: formatNumber(d.cbsysMnhlCnt, "cbsysMnhlCnt"), sprsysDrtwMnhlCnt: formatNumber(d.sprsysDrtwMnhlCnt, "sprsysDrtwMnhlCnt"), sprsysExlnMnhlCnt: formatNumber(d.sprsysExlnMnhlCnt, "sprsysExlnMnhlCnt"), - drtwRcvprpCnt: formatNumber(d.drtwRcvprpCnt, "drtwRcvprpCnt"), - exlnRcvprpCnt: formatNumber(d.exlnRcvprpCnt, "exlnRcvprpCnt"), + drtwDrgCnt: formatNumber(d.drtwDrgCnt, "drtwDrgCnt"), + exlnDrgCnt: formatNumber(d.exlnDrgCnt, "exlnDrgCnt"), stofcbrCnt: formatNumber(d.stofcbrCnt, "stofcbrCnt"), exlnOtflCnt: formatNumber(d.exlnOtflCnt, "exlnOtflCnt"), sewerLdgrEdpPrlg: formatNumber(d.sewerLdgrEdpPrlg, "sewerLdgrEdpPrlg"), @@ -1662,7 +1664,7 @@ const SewagePipeInp = () => { statsYr: values.year ?? "", ctpvNm: values.sido ?? "", ...toInputSearchRegion(sidoListRef.current, values), - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), saveList, }; @@ -1714,14 +1716,14 @@ const SewagePipeInp = () => { swtrmtFcltCd: nullableTrimmedString(d.swtrmtFcltCd), swtrmtFcltNm: nullableTrimmedString(d.swtrmtFcltNm), prcsZoneArea: formatNumber(d.prcsZoneArea, "prcsZoneArea"), - cbsysPrcsZoneArea: formatNumber(d.cbsysPrcsZoneArea, "cbsysPrcsZoneArea"), - sprsysPrcsZoneArea: formatNumber(d.sprsysPrcsZoneArea, "sprsysPrcsZoneArea"), + cbsysTrtznArea: formatNumber(d.cbsysTrtznArea, "cbsysTrtznArea"), + sprsysTrtznArea: formatNumber(d.sprsysTrtznArea, "sprsysTrtznArea"), sprsysVartnRt: formatNumber(d.sprsysVartnRt, "sprsysVartnRt"), - mltvEqpmCnt: formatNumber(d.mltvEqpmCnt, "mltvEqpmCnt"), - cbsysMltvEqpmCnt: formatNumber(d.cbsysMltvEqpmCnt, "cbsysMltvEqpmCnt"), - sprsysMltvEqpmCnt: formatNumber(d.sprsysMltvEqpmCnt, "sprsysMltvEqpmCnt"), - sprsysMltvLnkgCnt: formatNumber(d.sprsysMltvLnkgCnt, "sprsysMltvLnkgCnt"), - sprsysMltvYetLnkgCnt: formatNumber(d.sprsysMltvYetLnkgCnt, "sprsysMltvYetLnkgCnt"), + wholDrgCnt: formatNumber(d.wholDrgCnt, "wholDrgCnt"), + cbsysDrgCnt: formatNumber(d.cbsysDrgCnt, "cbsysDrgCnt"), + sprsysDrgCnt: formatNumber(d.sprsysDrgCnt, "sprsysDrgCnt"), + sprsysDrgLnkgCnt: formatNumber(d.sprsysDrgLnkgCnt, "sprsysDrgLnkgCnt"), + sprsysDrgNoinsLnkgCnt: formatNumber(d.sprsysDrgNoinsLnkgCnt, "sprsysDrgNoinsLnkgCnt"), wholFcltPrlg: formatNumber(d.wholFcltPrlg, "wholFcltPrlg"), wholIcptgAtlfcsPrlg: formatNumber(d.wholIcptgAtlfcsPrlg, "wholIcptgAtlfcsPrlg"), icptgPrlg: formatNumber(d.icptgPrlg, "icptgPrlg"), @@ -1729,10 +1731,10 @@ const SewagePipeInp = () => { cbsysStofcbrCnt: formatNumber(d.cbsysStofcbrCnt, "cbsysStofcbrCnt"), sprsysStofcbrCnt: formatNumber(d.sprsysStofcbrCnt, "sprsysStofcbrCnt"), sprsysExlnOtflCnt: formatNumber(d.sprsysExlnOtflCnt, "sprsysExlnOtflCnt"), - wholBrchlnPrlg: formatNumber(d.wholBrchlnPrlg, "wholBrchlnPrlg"), - cbsysBrchlnPrlg: formatNumber(d.cbsysBrchlnPrlg, "cbsysBrchlnPrlg"), - exlnBrchlnPrlg: formatNumber(d.exlnBrchlnPrlg, "exlnBrchlnPrlg"), - drtwBrchlnPrlg: formatNumber(d.drtwBrchlnPrlg, "drtwBrchlnPrlg"), + wholPplPrlg: formatNumber(d.wholPplPrlg, "wholPplPrlg"), + cbsysPplPrlg: formatNumber(d.cbsysPplPrlg, "cbsysPplPrlg"), + exlnPplPrlg: formatNumber(d.exlnPplPrlg, "exlnPplPrlg"), + drtwPplPrlg: formatNumber(d.drtwPplPrlg, "drtwPplPrlg"), rmrk: nullableTrimmedString(d.rmrk), })); @@ -1740,7 +1742,7 @@ const SewagePipeInp = () => { statsYr: values.year ?? "", ctpvNm: values.sido ?? "", ...toInputSearchRegion(sidoListRef.current, values), - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), saveList, }; @@ -1800,7 +1802,7 @@ const SewagePipeInp = () => { d[dmltnKey] as string | number | undefined, dmltnKey, ), - prlgWhol: formatNumber( + pipeWholPrlg: formatNumber( d[wholKey] as string | number | undefined, wholKey, ), @@ -1824,7 +1826,7 @@ const SewagePipeInp = () => { statsYr: values.year ?? "", ctpvNm: values.sido ?? "", ...toInputSearchRegion(sidoListRef.current, values), - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), saveList, }; @@ -1867,15 +1869,15 @@ const SewagePipeInp = () => { const saveList = currentData.map((d) => ({ pipeSeCd: nullableTrimmedString(d.pipeSeCd), - step1PdmtPrlg: formatNumber(d.step1PdmtPrlg, "step1PdmtPrlg"), - step2PdmtPrlg: formatNumber(d.step2PdmtPrlg, "step2PdmtPrlg"), - step3PdmtPrlg: formatNumber(d.step3PdmtPrlg, "step3PdmtPrlg"), - step4PdmtPrlg: formatNumber(d.step4PdmtPrlg, "step4PdmtPrlg"), - step5PdmtPrlg: formatNumber(d.step5PdmtPrlg, "step5PdmtPrlg"), - sqrePdmtPrlg: formatNumber(d.sqrePdmtPrlg, "sqrePdmtPrlg"), + frlvlPdmtPrlg: formatNumber(d.frlvlPdmtPrlg, "frlvlPdmtPrlg"), + sclvlPdmtPrlg: formatNumber(d.sclvlPdmtPrlg, "sclvlPdmtPrlg"), + thlvlPdmtPrlg: formatNumber(d.thlvlPdmtPrlg, "thlvlPdmtPrlg"), + folvlPdmtPrlg: formatNumber(d.folvlPdmtPrlg, "folvlPdmtPrlg"), + filvlPdmtPrlg: formatNumber(d.filvlPdmtPrlg, "filvlPdmtPrlg"), + shpPdmtPrlg: formatNumber(d.shpPdmtPrlg, "shpPdmtPrlg"), etcPdmtPrlg: formatNumber(d.etcPdmtPrlg, "etcPdmtPrlg"), rmrk: nullableTrimmedString(d.rmrk), - pdmtByTsmWhol: formatNumber(d.pdmtByTsmWhol, "pdmtByTsmWhol"), + pdmtSeWholPrlg: formatNumber(d.pdmtSeWholPrlg, "pdmtSeWholPrlg"), admdstCd: nullableTrimmedString(d.admdstCd), admdstNm: nullableTrimmedString(d.admdstNm), })); @@ -1886,7 +1888,7 @@ const SewagePipeInp = () => { statsYr: values.year ?? "", ctpvNm: values.sido ?? "", ...toInputSearchRegion(sidoListRef.current, values), - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), saveList, }; @@ -1944,7 +1946,7 @@ const SewagePipeInp = () => { statsYr: values.year ?? "", ctpvNm: values.sido ?? "", ...toInputSearchRegion(sidoListRef.current, values), - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), saveList, }; @@ -2025,7 +2027,7 @@ const SewagePipeInp = () => { {submitOk && void submitFunc(false)} />} )} - {activeTabStatus?.laeSbmsnSttsCd === "2" && submitOk && ( + {activeTabStatus?.lclgvSbmsnSttsCd === "2" && submitOk && ( )} {showSaveInToolbar && } @@ -2219,8 +2221,8 @@ const SewagePipeInp = () => { .map((e) => { const prefix = e.vrfcCd === "IMR" ? "시계열 검증 - " : (e.vrfcCd === "NV" ? "일반검증 - " : "모집단 검증 - "); - const comp = e.compVlCn ?? ""; - const now = e.nowVlCn ?? ""; + const comp = e.cmprCn ?? ""; + const now = e.nowCn ?? ""; return `${prefix}${e.rsnExpln} (검증 기준값: ${comp} / 현재 입력값: ${now})`; }) diff --git a/apps/st/src/components/statistics/input/SewagePipeMaintainInp.tsx b/apps/st/src/components/statistics/input/SewagePipeMaintainInp.tsx index 0245ca1a7..46d23bfbe 100644 --- a/apps/st/src/components/statistics/input/SewagePipeMaintainInp.tsx +++ b/apps/st/src/components/statistics/input/SewagePipeMaintainInp.tsx @@ -113,8 +113,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (["2", "3"].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (["2", "3"].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -142,7 +142,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === "2"; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === "2"; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = @@ -220,18 +220,19 @@ function buildRepairRowList( admdstCd: nullableTrimmedString(d.admdstCd), sggNm: nullableTrimmedString(d.sggNm), admdstNm: nullableTrimmedString(d.admdstNm), - mendngWhol: formatNumber(d.mendngWhol, "mendngWhol"), - cbsysMendngPrlg: formatNumber(d.cbsysMendngPrlg, "cbsysMendngPrlg"), + dfrpWholPrlg: formatNumber(d.dfrpWholPrlg, "dfrpWholPrlg"), + cbsysDfrpPrlg: formatNumber(d.cbsysDfrpPrlg, "cbsysDfrpPrlg"), sprsysExlnPrlg: formatNumber(d.sprsysExlnPrlg, "sprsysExlnPrlg"), sprsysDrtwPrlg: formatNumber(d.sprsysDrtwPrlg, "sprsysDrtwPrlg"), - cbsysPartMendngPrlg: formatNumber(d.cbsysPartMendngPrlg, "cbsysPartMendngPrlg"), - sprsysExlnMendngPrlg: formatNumber(d.sprsysExlnMendngPrlg, "sprsysExlnMendngPrlg"), - sprsysDrtwMendngPrlg: formatNumber(d.sprsysDrtwMendngPrlg, "sprsysDrtwMendngPrlg"), + partDfrpWhol: formatNumber(d.partDfrpWhol, "partDfrpWhol"), + cbsysPartDfrpPrlg: formatNumber(d.cbsysPartDfrpPrlg, "cbsysPartDfrpPrlg"), + sprsysExlnDfrpPrlg: formatNumber(d.sprsysExlnDfrpPrlg, "sprsysExlnDfrpPrlg"), + sprsysDrtwDfrpPrlg: formatNumber(d.sprsysDrtwDfrpPrlg, "sprsysDrtwDfrpPrlg"), cbsysMnhlCnt: formatNumber(d.cbsysMnhlCnt, "cbsysMnhlCnt"), sprsysDrtwMnhlCnt: formatNumber(d.sprsysDrtwMnhlCnt, "sprsysDrtwMnhlCnt"), sprsysExlnMnhlCnt: formatNumber(d.sprsysExlnMnhlCnt, "sprsysExlnMnhlCnt"), - drtwRcvprpCnt: formatNumber(d.drtwRcvprpCnt, "drtwRcvprpCnt"), - exlnRcvprpCnt: formatNumber(d.exlnRcvprpCnt, "exlnRcvprpCnt"), + drtwDrgCnt: formatNumber(d.drtwDrgCnt, "drtwDrgCnt"), + exlnDrgCnt: formatNumber(d.exlnDrgCnt, "exlnDrgCnt"), stofcbrCnt: formatNumber(d.stofcbrCnt, "stofcbrCnt"), otflCnt: formatNumber(d.otflCnt, "otflCnt"), cctvExmnPrlg: formatNumber(d.cctvExmnPrlg, "cctvExmnPrlg"), @@ -254,14 +255,14 @@ function buildDredgingRowList( sprsysExlnPrlg: formatNumber(d.sprsysExlnPrlg, "sprsysExlnPrlg"), sprsysDrtwPrlg: formatNumber(d.sprsysDrtwPrlg, "sprsysDrtwPrlg"), mnhlCnt: formatNumber(d.mnhlCnt, "mnhlCnt"), - exlnDrtwRcvprpCnt: formatNumber(d.exlnDrtwRcvprpCnt, "exlnDrtwRcvprpCnt"), + exlnDrtwDrgCnt: formatNumber(d.exlnDrtwDrgCnt, "exlnDrtwDrgCnt"), stofcbrOtflCnt: formatNumber(d.stofcbrOtflCnt, "stofcbrOtflCnt"), drdgnPlanPrlg: formatNumber(d.drdgnPlanPrlg, "drdgnPlanPrlg"), drdgnTrgtCtrsDrdgnRt: formatNumber(d.drdgnTrgtCtrsDrdgnRt, "drdgnTrgtCtrsDrdgnRt"), wholPrlgCtrsDrdgnRt: formatNumber(d.wholPrlgCtrsDrdgnRt, "wholPrlgCtrsDrdgnRt"), drdgnAmt: formatNumber(d.drdgnAmt, "drdgnAmt"), - drdgnQnt: formatNumber(d.drdgnQnt, "drdgnQnt"), - drdgnUntprcAmt: formatNumber(d.drdgnUntprcAmt, "drdgnUntprcAmt"), + pplDrdqty: formatNumber(d.pplDrdqty, "pplDrdqty"), + drdgnSoilPrcsAmt: formatNumber(d.drdgnSoilPrcsAmt, "drdgnSoilPrcsAmt"), wholDrdgnPrcsQnt: formatNumber(d.wholDrdgnPrcsQnt, "wholDrdgnPrcsQnt"), rclmQnt: formatNumber(d.rclmQnt, "rclmQnt"), oceanEmsnQnt: formatNumber(d.oceanEmsnQnt, "oceanEmsnQnt"), @@ -613,14 +614,14 @@ const SewagePipeMaintainInp = () => { statsYr: lastSearchedValues.year ?? "", ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - laePicNm: submitInfo.laePicNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laePicTelNo: submitInfo.laePicTelNo, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, }; const verificationQuery = { @@ -648,12 +649,12 @@ const SewagePipeMaintainInp = () => { const response = isRepairTab ? await sewagePipeMaintainApiService.submitSewagePipeMaintainRepair({ ...submitInfoBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: buildRepairRowList(currentData), } satisfies SewagePipeMaintainRepairSubmitRequest) : await sewagePipeMaintainApiService.submitSewagePipeMaintainDredging({ ...submitInfoBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: buildDredgingRowList(currentData), } satisfies SewagePipeMaintainDredgingSubmitRequest); @@ -673,7 +674,7 @@ const SewagePipeMaintainInp = () => { sewer_bzmn_cd: lastSearchedValues?.bsnmCd ?? "", stats_cd: statsCdForTab, stats_yr: lastSearchedValues.year ?? "", - lae_sbmsn_stts_cd: activeTabStatus?.laeSbmsnSttsCd === "4" ? "4" : "2", + lae_sbmsn_stts_cd: activeTabStatus?.lclgvSbmsnSttsCd === "4" ? "4" : "2", gen_verify_stts_cd: nvpassed ? "1" : "2", hb_pass_yn: response.data?.isHbPassed, }; @@ -767,7 +768,7 @@ const SewagePipeMaintainInp = () => { const param: SewagePipeMaintainRepairSaveRequest = { ...baseRequest, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: buildRepairRowList(currentData), }; if (isAdminInfo) { @@ -804,7 +805,7 @@ const SewagePipeMaintainInp = () => { const param: SewagePipeMaintainDredgingSaveRequest = { ...baseRequest, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: buildDredgingRowList(currentData), }; if (isAdminInfo) { @@ -856,7 +857,7 @@ const SewagePipeMaintainInp = () => { ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), ctpvNm: lastSearchedValues.sido ?? "", statsYr: lastSearchedValues.year ?? "", - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCdForTab, }; @@ -1108,7 +1109,7 @@ const SewagePipeMaintainInp = () => { .map((e) => { const prefix = e.vrfcCd === "IMR" ? "시계열 검증 - " : e.vrfcCd === "NV" ? "일반검증 - " : "모집단 검증 - "; - return `${prefix}${e.rsnExpln}(검증 기준값: ${e.compVlCn} / 현재 입력값: ${e.nowVlCn})`; + return `${prefix}${e.rsnExpln}(검증 기준값: ${e.cmprCn} / 현재 입력값: ${e.nowCn})`; }) .filter(Boolean) .join("\n"); @@ -1143,7 +1144,7 @@ const SewagePipeMaintainInp = () => { {submitOk && } )} - {activeTabStatus?.laeSbmsnSttsCd === "2" && submitOk && ( + {activeTabStatus?.lclgvSbmsnSttsCd === "2" && submitOk && ( )} {showSaveInToolbar && } diff --git a/apps/st/src/components/statistics/input/SewageReservoirPumpInp.tsx b/apps/st/src/components/statistics/input/SewageReservoirPumpInp.tsx index b3e51f958..f16d6ed52 100644 --- a/apps/st/src/components/statistics/input/SewageReservoirPumpInp.tsx +++ b/apps/st/src/components/statistics/input/SewageReservoirPumpInp.tsx @@ -125,8 +125,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (["2", "3"].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (["2", "3"].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -162,7 +162,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === "2"; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === "2"; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = @@ -274,7 +274,7 @@ function mapSewageReservoirListToGridRows( ctpvNm, oprtngStrtYmd: formatCompactYmdForGrid(item.oprtngStrtYmd), fldngPrvtnYn: normalizeOxYnValue(item.fldngPrvtnYn), - wqPlltnMtgtYn: normalizeOxYnValue(item.wqPlltnMtgtYn), + wtpltMtgtYn: normalizeOxYnValue(item.wtpltMtgtYn), rtlztnUsgYn: normalizeOxYnValue(item.rtlztnUsgYn), }, ])[0] as GridRowWithVerification; @@ -332,37 +332,37 @@ function buildSewageReservoirSaveItem( oprtngStrtYmd: toCompactYmdOrNull(row.oprtngStrtYmd), planDesignFreqCnt: toGridNumber(row.planDesignFreqCnt), fldngPrvtnYn: nullableTrimmedString(normalizeOxYnValue(row.fldngPrvtnYn)), - wqPlltnMtgtYn: nullableTrimmedString(normalizeOxYnValue(row.wqPlltnMtgtYn)), + wtpltMtgtYn: nullableTrimmedString(normalizeOxYnValue(row.wtpltMtgtYn)), rtlztnUsgYn: nullableTrimmedString(normalizeOxYnValue(row.rtlztnUsgYn)), fcltStrctCn: nullableTrimmedString(row.fcltStrctCn), wtrStrgZoneArea: toGridNumber(row.wtrStrgZoneArea), impdFcltCpct: toGridNumber(row.impdFcltCpct), - grssPpqty: toGridNumber(row.grssPpqty), + wholPpqty: toGridNumber(row.wholPpqty), pumpFcltN1DmtrExpln: toPumpDmtrExpln(row.pumpFcltN1DmtrExpln), - pumpFcltN1PerPpqty: toGridNumber(row.pumpFcltN1PerPpqty), + pumpFcltN1Ppqty: toGridNumber(row.pumpFcltN1Ppqty), pumpFcltN1PumpCnt: toGridNumber(row.pumpFcltN1PumpCnt), pumpFcltN1RsrvPumpCnt: toGridNumber(row.pumpFcltN1RsrvPumpCnt), pumpFcltN2DmtrExpln: toPumpDmtrExpln(row.pumpFcltN2DmtrExpln), - pumpFcltN2PerPpqty: toGridNumber(row.pumpFcltN2PerPpqty), + pumpFcltN2Ppqty: toGridNumber(row.pumpFcltN2Ppqty), pumpFcltN2PumpCnt: toGridNumber(row.pumpFcltN2PumpCnt), pumpFcltN2RsrvPumpCnt: toGridNumber(row.pumpFcltN2RsrvPumpCnt), pumpFcltN3DmtrExpln: toPumpDmtrExpln(row.pumpFcltN3DmtrExpln), - pumpFcltN3PerPpqty: toGridNumber(row.pumpFcltN3PerPpqty), + pumpFcltN3Ppqty: toGridNumber(row.pumpFcltN3Ppqty), pumpFcltN3PumpCnt: toGridNumber(row.pumpFcltN3PumpCnt), pumpFcltN3RsrvPumpCnt: toGridNumber(row.pumpFcltN3RsrvPumpCnt), prcsgFcltYn: row.prcsgFcltYn ? (row.prcsgFcltYn === "무" ? "N" : "Y") : null, - ddrztnEqpmYn: row.ddrztnEqpmYn ? (row.prcsgFcltYn === "무" ? "N" : "Y") : null, + odorEqpmYn: row.odorEqpmYn ? (row.prcsgFcltYn === "무" ? "N" : "Y") : null, oslfEtgtYn: row.oslfEtgtYn ? (row.prcsgFcltYn === "무" ? "N" : "Y") : null, - mltvMthCn: nullableTrimmedString(row.mltvMthCn), + drgptnCn: nullableTrimmedString(row.drgptnCn), impdMthCn: nullableTrimmedString(row.impdMthCn), - impdPrcsMthdCn: nullableTrimmedString(row.impdPrcsMthdCn), + impdPrcsCn: nullableTrimmedString(row.impdPrcsCn), dschgWtrsExpln: nullableTrimmedString(row.dschgWtrsExpln), - prcptnLastDspsQnt: toGridNumber(row.prcptnLastDspsQnt), + prpwLastDspsQnt: toGridNumber(row.prpwLastDspsQnt), ctmnLastDspsQnt: toGridNumber(row.ctmnLastDspsQnt), - prcptnLastDspsMthdExpln: nullableTrimmedString(row.prcptnLastDspsMthdExpln), - ctmnLastDspsMthdExpln: nullableTrimmedString(row.ctmnLastDspsMthdExpln), + prpwLastDspsExpln: nullableTrimmedString(row.prpwLastDspsExpln), + ctmnLastDspsExpln: nullableTrimmedString(row.ctmnLastDspsExpln), oprtngDayCnt: toGridNumber(row.oprtngDayCnt), - grssMltvQnt: toGridNumber(row.grssMltvQnt), + wholQnt: toGridNumber(row.wholQnt), rmrk: nullableTrimmedString(row.rmrk), }; } @@ -386,32 +386,32 @@ function buildRainfallPumpStationSaveItem( oprtngStrtYmd: toCompactYmdOrNull(row.oprtngStrtYmd), planDesignFreqCnt: toGridNumber(row.planDesignFreqCnt), wtrStrgZoneArea: toGridNumber(row.wtrStrgZoneArea), - rsvrYn: row.rsvrYn ? (row.rsvrYn === "무" ? "N" : "Y") : null, - rsvrImpndQnt: toGridNumber(row.rsvrImpndQnt), + runwtrYn: row.runwtrYn ? (row.runwtrYn === "무" ? "N" : "Y") : null, + runwtrStrqty: toGridNumber(row.runwtrStrqty), abstnRgnImpdQnt: toGridNumber(row.abstnRgnImpdQnt), - grssPpqty: toGridNumber(row.grssPpqty), + wholPpqty: toGridNumber(row.wholPpqty), pumpFcltN1DmtrExpln: toPumpDmtrExpln(row.pumpFcltN1DmtrExpln), - pumpFcltN1PerPpqty: toGridNumber(row.pumpFcltN1PerPpqty), + pumpFcltN1UnitPpqty: toGridNumber(row.pumpFcltN1UnitPpqty), pumpFcltN1PumpCnt: toGridNumber(row.pumpFcltN1PumpCnt), pumpFcltN1RsrvPumpCnt: toGridNumber(row.pumpFcltN1RsrvPumpCnt), pumpFcltN2DmtrExpln: toPumpDmtrExpln(row.pumpFcltN2DmtrExpln), - pumpFcltN2PerPpqty: toGridNumber(row.pumpFcltN2PerPpqty), + pumpFcltN2UnitPpqty: toGridNumber(row.pumpFcltN2UnitPpqty), pumpFcltN2PumpCnt: toGridNumber(row.pumpFcltN2PumpCnt), pumpFcltN2RsrvPumpCnt: toGridNumber(row.pumpFcltN2RsrvPumpCnt), pumpFcltN3DmtrExpln: toPumpDmtrExpln(row.pumpFcltN3DmtrExpln), - pumpFcltN3PerPpqty: toGridNumber(row.pumpFcltN3PerPpqty), + pumpFcltN3UnitPpqty: toGridNumber(row.pumpFcltN3UnitPpqty), pumpFcltN3PumpCnt: toGridNumber(row.pumpFcltN3PumpCnt), pumpFcltN3RsrvPumpCnt: toGridNumber(row.pumpFcltN3RsrvPumpCnt), prcsgFcltYn: row.prcsgFcltYn ? (row.prcsgFcltYn === "무" ? "N" : "Y") : null, - ddrztnEqpmYn: row.ddrztnEqpmYn ? (row.prcsgFcltYn === "무" ? "N" : "Y") : null, + odorEqpmYn: row.odorEqpmYn ? (row.prcsgFcltYn === "무" ? "N" : "Y") : null, oslfEtgtYn: row.oslfEtgtYn ? (row.prcsgFcltYn === "무" ? "N" : "Y") : null, dschgWtrsExpln: nullableTrimmedString(row.dschgWtrsExpln), - prcptnLastDspsQnt: toGridNumber(row.prcptnLastDspsQnt), + prpwLastDspsQnt: toGridNumber(row.prpwLastDspsQnt), ctmnLastDspsQnt: toGridNumber(row.ctmnLastDspsQnt), - prcptnLastDspsMthdExpln: nullableTrimmedString(row.prcptnLastDspsMthdExpln), - ctmnLastDspsMthdExpln: nullableTrimmedString(row.ctmnLastDspsMthdExpln), + prpwLastDspsExpln: nullableTrimmedString(row.prpwLastDspsExpln), + ctmnLastDspsExpln: nullableTrimmedString(row.ctmnLastDspsExpln), oprtngDayCnt: toGridNumber(row.oprtngDayCnt), - grssMltvQnt: toGridNumber(row.grssMltvQnt), + wholQnt: toGridNumber(row.wholQnt), rmrk: nullableTrimmedString(row.rmrk), }; } @@ -427,9 +427,9 @@ function mapRainfallPumpStationListToGridRows( ...item, ctpvNm, oprtngStrtYmd: formatCompactYmdForGrid(item.oprtngStrtYmd), - rsvrYn: normalizeOxYnValue(item.rsvrYn), + runwtrYn: normalizeOxYnValue(item.runwtrYn), prcsgFcltYn: normalizeOxYnValue(item.prcsgFcltYn), - ddrztnEqpmYn: normalizeOxYnValue(item.ddrztnEqpmYn), + odorEqpmYn: normalizeOxYnValue(item.odorEqpmYn), oslfEtgtYn: normalizeOxYnValue(item.oslfEtgtYn), }, ])[0] as GridRowWithVerification; @@ -531,7 +531,7 @@ const SewageReservoirPumpInp = () => { ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), ctpvNm: lastSearchedValues.sido ?? "", statsYr: lastSearchedValues.year ?? "", - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCdForTab, }; @@ -720,13 +720,13 @@ const SewageReservoirPumpInp = () => { const response = isReservoirTab ? await statisticsInputSewageReservoirPumpApi.saveSewageReservoir({ ...requestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: saveList as SewageReservoirSaveItem[], deleteList: deleteList as SewageReservoirSaveItem[], }) : await statisticsInputSewageReservoirPumpApi.saveRainfallPumpStation({ ...requestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: saveList as RainfallPumpStationSaveItem[], deleteList: deleteList as RainfallPumpStationSaveItem[], }); @@ -813,14 +813,14 @@ const SewageReservoirPumpInp = () => { ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), ...(noApplicable ? { noApplicable: true } : {}), - laePicNm: submitInfo.laePicNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laePicTelNo: submitInfo.laePicTelNo, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, }; try { @@ -830,13 +830,13 @@ const SewageReservoirPumpInp = () => { const response = isReservoirTab ? await statisticsInputSewageReservoirPumpApi.submitSewageReservoir({ ...submitRequestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: submitList as SewageReservoirSaveItem[], deleteList: deleteList as SewageReservoirSaveItem[], }) : await statisticsInputSewageReservoirPumpApi.submitRainfallPumpStation({ ...submitRequestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: submitList as RainfallPumpStationSaveItem[], deleteList: deleteList as RainfallPumpStationSaveItem[], }); @@ -858,7 +858,7 @@ const SewageReservoirPumpInp = () => { stats_cd: statsCdForTab, stats_yr: lastSearchedValues.year ?? "", lae_sbmsn_stts_cd: - activeTabStatus?.laeSbmsnSttsCd === "4" ? "4" : "2", + activeTabStatus?.lclgvSbmsnSttsCd === "4" ? "4" : "2", gen_verify_stts_cd: nvpassed ? "1" : "2", hb_pass_yn: response.data?.isHbPassed, }; @@ -1525,7 +1525,7 @@ const SewageReservoirPumpInp = () => { ? "일반검증 - " : "모집단 검증 -"; return `${prefix}${e.rsnExpln} -(검증 기준값: ${e.compVlCn} / 현재 입력값: ${e.nowVlCn})`; +(검증 기준값: ${e.cmprCn} / 현재 입력값: ${e.nowCn})`; }) .filter(Boolean) .join("\n"); @@ -1584,7 +1584,7 @@ const SewageReservoirPumpInp = () => { {submitOk && } )} - {activeTabStatus?.laeSbmsnSttsCd === "2" && submitOk && ( + {activeTabStatus?.lclgvSbmsnSttsCd === "2" && submitOk && ( )} {showSaveInToolbar && } diff --git a/apps/st/src/components/statistics/input/SewerageFinanceInp.tsx b/apps/st/src/components/statistics/input/SewerageFinanceInp.tsx index f3cf695d9..fb19d9bfb 100644 --- a/apps/st/src/components/statistics/input/SewerageFinanceInp.tsx +++ b/apps/st/src/components/statistics/input/SewerageFinanceInp.tsx @@ -118,8 +118,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (["2", "3"].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (["2", "3"].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -147,7 +147,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === "2"; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === "2"; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = isSubmitted && periodEnterable && gugunOk; @@ -217,32 +217,32 @@ function buildSewerageFinanceSettleSaveList( admdstCd: nullableTrimmedString(d.admdstCd), sggNm: nullableTrimmedString(d.sggNm), admdstNm: nullableTrimmedString(d.admdstNm), - cnterGovSprtAmt: formatNumber(d.cnterGovSprtAmt, "cnterGovSprtAmt"), + soaGovSprtAmt: formatNumber(d.soaGovSprtAmt, "soaGovSprtAmt"), mctpvLcexpAmt: formatNumber(d.mctpvLcexpAmt, "mctpvLcexpAmt"), wareaSggLclAmt: formatNumber(d.wareaSggLclAmt, "wareaSggLclAmt"), sewerUseAmt: formatNumber(d.sewerUseAmt, "sewerUseAmt"), - orgprBrdnAmt: formatNumber(d.orgprBrdnAmt, "orgprBrdnAmt"), + fnnOrgprBrdnAmt: formatNumber(d.fnnOrgprBrdnAmt, "fnnOrgprBrdnAmt"), etcIncmAmt: formatNumber(d.etcIncmAmt, "etcIncmAmt"), - crfwAmt: formatNumber(d.crfwAmt, "crfwAmt"), - lbltAmt: formatNumber(d.lbltAmt, "lbltAmt"), + soaCrfwAmt: formatNumber(d.soaCrfwAmt, "soaCrfwAmt"), + soaLbltAmt: formatNumber(d.soaLbltAmt, "soaLbltAmt"), tmplntFcltAmt: formatNumber(d.tmplntFcltAmt, "tmplntFcltAmt"), - tmplntMendngAmt: formatNumber(d.tmplntMendngAmt, "tmplntMendngAmt"), + tmplntAmt: formatNumber(d.tmplntAmt, "tmplntAmt"), tmplntOperKeepAmt: formatNumber(d.tmplntOperKeepAmt, "tmplntOperKeepAmt"), tmplntEtcAmt: formatNumber(d.tmplntEtcAmt, "tmplntEtcAmt"), swagePplFcltAmt: formatNumber(d.swagePplFcltAmt, "swagePplFcltAmt"), - swagePplMendngAmt: formatNumber(d.swagePplMendngAmt, "swagePplMendngAmt"), + swagePplAmt: formatNumber(d.swagePplAmt, "swagePplAmt"), swagePplOperKeepAmt: formatNumber(d.swagePplOperKeepAmt, "swagePplOperKeepAmt"), swagePplEtcAmt: formatNumber(d.swagePplEtcAmt, "swagePplEtcAmt"), swageImpdFcltAmt: formatNumber(d.swageImpdFcltAmt, "swageImpdFcltAmt"), - swageImpdMendngAmt: formatNumber(d.swageImpdMendngAmt, "swageImpdMendngAmt"), + swageImpdAmt: formatNumber(d.swageImpdAmt, "swageImpdAmt"), swageImpdOperKeepAmt: formatNumber(d.swageImpdOperKeepAmt, "swageImpdOperKeepAmt"), swageImpdFcltEtcAmt: formatNumber(d.swageImpdFcltEtcAmt, "swageImpdFcltEtcAmt"), etcAcdntCrfwAmt: formatNumber(d.etcAcdntCrfwAmt, "etcAcdntCrfwAmt"), etcNrcpAmt: formatNumber(d.etcNrcpAmt, "etcNrcpAmt"), - etcAmt: formatNumber(d.etcAmt, "etcAmt"), + fnnEtcAmt: formatNumber(d.fnnEtcAmt, "fnnEtcAmt"), rmrk: nullableTrimmedString(d.rmrk), - fnnByWholPjtcoAmt: formatNumber(d.fnnByWholPjtcoAmt, "fnnByWholPjtcoAmt"), - usgByWholPjtcoAmt: formatNumber(d.usgByWholPjtcoAmt, "usgByWholPjtcoAmt"), + fnnSeWholPjtcoAmt: formatNumber(d.fnnSeWholPjtcoAmt, "fnnSeWholPjtcoAmt"), + usgSeWholPjtcoAmt: formatNumber(d.usgSeWholPjtcoAmt, "usgSeWholPjtcoAmt"), tmplntWholAmt: formatNumber(d.tmplntWholAmt, "tmplntWholAmt"), wholSwagePplAmt: formatNumber(d.wholSwagePplAmt, "wholSwagePplAmt"), wholSwageImpdFcltAmt: formatNumber(d.wholSwageImpdFcltAmt, "wholSwageImpdFcltAmt"), @@ -260,12 +260,12 @@ function buildSewerageChargeSaveList( sggNm: nullableTrimmedString(d.sggNm), admdstNm: nullableTrimmedString(d.admdstNm), anlLevyQnt: formatNumber(d.anlLevyQnt, "anlLevyQnt"), - levyAmt: formatNumber(d.levyAmt, "levyAmt"), - grssPrmcoAmt: formatNumber(d.grssPrmcoAmt, "grssPrmcoAmt"), + sewerLevyAmt: formatNumber(d.sewerLevyAmt, "sewerLevyAmt"), + wholPrmcoAmt: formatNumber(d.wholPrmcoAmt, "wholPrmcoAmt"), rmrk: nullableTrimmedString(d.rmrk), avgUntprcAmt: formatNumber(d.avgUntprcAmt, "avgUntprcAmt"), - grssUnitPrmcoAmt: formatNumber(d.grssUnitPrmcoAmt, "grssUnitPrmcoAmt"), - rlztnRt: formatNumber(d.rlztnRt, "rlztnRt"), + wholUnitPrmcoAmt: formatNumber(d.wholUnitPrmcoAmt, "wholUnitPrmcoAmt"), + sewerCrgRlztnRt: formatNumber(d.sewerCrgRlztnRt, "sewerCrgRlztnRt"), })); } @@ -281,27 +281,27 @@ function buildSewerageUsageFeeSaveList( hshusLevyAmt: formatNumber(d.hshusLevyAmt, "hshusLevyAmt"), hshusLevyQnt: formatNumber(d.hshusLevyQnt, "hshusLevyQnt"), hshusUntprcAmt: formatNumber(d.hshusUntprcAmt, "hshusUntprcAmt"), - taskFrLevyAmt: formatNumber(d.taskFrLevyAmt, "taskFrLevyAmt"), - taskFrLevyQnt: formatNumber(d.taskFrLevyQnt, "taskFrLevyQnt"), - taskFrUntprcAmt: formatNumber(d.taskFrUntprcAmt, "taskFrUntprcAmt"), + ofuseLevyAmt: formatNumber(d.ofuseLevyAmt, "ofuseLevyAmt"), + ofuseLevyQnt: formatNumber(d.ofuseLevyQnt, "ofuseLevyQnt"), + ofuseUntprcAmt: formatNumber(d.ofuseUntprcAmt, "ofuseUntprcAmt"), fbuLevyAmt: formatNumber(d.fbuLevyAmt, "fbuLevyAmt"), fbuLevyQnt: formatNumber(d.fbuLevyQnt, "fbuLevyQnt"), fbuUntprcAmt: formatNumber(d.fbuUntprcAmt, "fbuUntprcAmt"), - bthhsFrSpcs1LevyAmt: formatNumber(d.bthhsFrSpcs1LevyAmt, "bthhsFrSpcs1LevyAmt"), - bthhsFrSpcs1LevyQnt: formatNumber(d.bthhsFrSpcs1LevyQnt, "bthhsFrSpcs1LevyQnt"), - bthhsFrSpcs1UntprcAmt: formatNumber(d.bthhsFrSpcs1UntprcAmt, "bthhsFrSpcs1UntprcAmt"), - bthhsFrSpcs2LevyAmt: formatNumber(d.bthhsFrSpcs2LevyAmt, "bthhsFrSpcs2LevyAmt"), - bthhsFrSpcs2LevyQnt: formatNumber(d.bthhsFrSpcs2LevyQnt, "bthhsFrSpcs2LevyQnt"), - bthhsFrSpcs2UntprcAmt: formatNumber(d.bthhsFrSpcs2UntprcAmt, "bthhsFrSpcs2UntprcAmt"), - induLevyAmt: formatNumber(d.induLevyAmt, "induLevyAmt"), - induLevyQnt: formatNumber(d.induLevyQnt, "induLevyQnt"), - induUntprcAmt: formatNumber(d.induUntprcAmt, "induUntprcAmt"), + btht1LevyAmt: formatNumber(d.btht1LevyAmt, "btht1LevyAmt"), + btht1LevyQnt: formatNumber(d.btht1LevyQnt, "btht1LevyQnt"), + btht1UntprcAmt: formatNumber(d.btht1UntprcAmt, "btht1UntprcAmt"), + btht2LevyAmt: formatNumber(d.btht2LevyAmt, "btht2LevyAmt"), + btht2LevyQnt: formatNumber(d.btht2LevyQnt, "btht2LevyQnt"), + btht2UntprcAmt: formatNumber(d.btht2UntprcAmt, "btht2UntprcAmt"), + indstLevyAmt: formatNumber(d.indstLevyAmt, "indstLevyAmt"), + indstLevyQnt: formatNumber(d.indstLevyQnt, "indstLevyQnt"), + indstUntprcAmt: formatNumber(d.indstUntprcAmt, "indstUntprcAmt"), etcLevyAmt: formatNumber(d.etcLevyAmt, "etcLevyAmt"), etcLevyQnt: formatNumber(d.etcLevyQnt, "etcLevyQnt"), etcLevyUntprcAmt: formatNumber(d.etcLevyUntprcAmt, "etcLevyUntprcAmt"), rmrk: nullableTrimmedString(d.rmrk), - levyAmt: formatNumber(d.levyAmt, "levyAmt"), - levyQnt: formatNumber(d.levyQnt, "levyQnt"), + sewerLevyAmt: formatNumber(d.sewerLevyAmt, "sewerLevyAmt"), + sewerLevyQnt: formatNumber(d.sewerLevyQnt, "sewerLevyQnt"), })); } @@ -314,14 +314,14 @@ function buildCauserBurdenSaveList( admdstCd: nullableTrimmedString(d.admdstCd), sggNm: nullableTrimmedString(d.sggNm), admdstNm: nullableTrimmedString(d.admdstNm), - levyEvntcsCnt: formatNumber(d.levyEvntcsCnt, "levyEvntcsCnt"), - levyAmt: formatNumber(d.levyAmt, "levyAmt"), - mltvEqpmEvntcsCnt: formatNumber(d.mltvEqpmEvntcsCnt, "mltvEqpmEvntcsCnt"), - mltvEqpmAmt: formatNumber(d.mltvEqpmAmt, "mltvEqpmAmt"), + brdnAmtLevyNocs: formatNumber(d.brdnAmtLevyNocs, "brdnAmtLevyNocs"), + brdnAmtLevyAmt: formatNumber(d.brdnAmtLevyAmt, "brdnAmtLevyAmt"), + drgNocs: formatNumber(d.drgNocs, "drgNocs"), + drgAmt: formatNumber(d.drgAmt, "drgAmt"), othrCstrnOthrActrCnt: formatNumber(d.othrCstrnOthrActrCnt, "othrCstrnOthrActrCnt"), othrCstrnOthrActrAmt: formatNumber(d.othrCstrnOthrActrAmt, "othrCstrnOthrActrAmt"), rmrk: nullableTrimmedString(d.rmrk), - trgtByWholClctnAmt: formatNumber(d.trgtByWholClctnAmt, "trgtByWholClctnAmt"), + trgtSeWholClctnAmt: formatNumber(d.trgtSeWholClctnAmt, "trgtSeWholClctnAmt"), })); } @@ -773,7 +773,7 @@ const SewerageFinanceInp = () => { ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), ctpvNm: lastSearchedValues.sido ?? "", statsYr: lastSearchedValues.year ?? "", - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCdForTab, }; @@ -855,14 +855,14 @@ const SewerageFinanceInp = () => { statsYr: lastSearchedValues.year ?? "", ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - laePicNm: submitInfo.laePicNm, - laePicTelNo: submitInfo.laePicTelNo, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, }; const verificationQuery = { @@ -892,7 +892,7 @@ const SewerageFinanceInp = () => { if (isSettleTab) { const param: SewerageFinanceSettleSubmitRequest = { ...submitInfoBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: buildSewerageFinanceSettleSaveList(currentData), ...adminOpt, }; @@ -903,7 +903,7 @@ const SewerageFinanceInp = () => { } else if (isChargeTab) { const param: SewerageChargeSubmitRequest = { ...submitInfoBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: buildSewerageChargeSaveList(currentData), ...adminOpt, }; @@ -911,7 +911,7 @@ const SewerageFinanceInp = () => { } else if (isUsageFeeTab) { const param: SewerageUsageFeeSubmitRequest = { ...submitInfoBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: buildSewerageUsageFeeSaveList(currentData), ...adminOpt, }; @@ -920,7 +920,7 @@ const SewerageFinanceInp = () => { } else { const param: CauserBurdenSubmitRequest = { ...submitInfoBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: buildCauserBurdenSaveList(currentData), ...adminOpt, }; @@ -943,7 +943,7 @@ const SewerageFinanceInp = () => { sewer_bzmn_cd: lastSearchedValues?.bsnmCd ?? "", stats_cd: statsCdForTab, stats_yr: lastSearchedValues.year ?? "", - lae_sbmsn_stts_cd: activeTabStatus?.laeSbmsnSttsCd === "4" ? "4" : "2", + lae_sbmsn_stts_cd: activeTabStatus?.lclgvSbmsnSttsCd === "4" ? "4" : "2", gen_verify_stts_cd: nvpassed ? "1" : "2", hb_pass_yn: response.data?.isHbPassed, }; @@ -1039,7 +1039,7 @@ const SewerageFinanceInp = () => { if (isSettleTab) { const param: SewerageFinanceSettleSaveRequest = { ...baseRequest, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: buildSewerageFinanceSettleSaveList(currentData), ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), }; @@ -1063,7 +1063,7 @@ const SewerageFinanceInp = () => { if (isChargeTab) { const param: SewerageChargeSaveRequest = { ...baseRequest, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: buildSewerageChargeSaveList(currentData), ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), }; @@ -1087,7 +1087,7 @@ const SewerageFinanceInp = () => { if (isUsageFeeTab) { const param: SewerageUsageFeeSaveRequest = { ...baseRequest, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: buildSewerageUsageFeeSaveList(currentData), ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), }; @@ -1110,7 +1110,7 @@ const SewerageFinanceInp = () => { const param: CauserBurdenSaveRequest = { ...baseRequest, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, saveList: buildCauserBurdenSaveList(currentData), ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), }; @@ -1232,7 +1232,7 @@ const SewerageFinanceInp = () => { : e.vrfcCd === "NV" ? "일반검증 - " : "모집단 검증 - "; - return `${prefix}${e.rsnExpln}(검증 기준값: ${e.compVlCn} / 현재 입력값: ${e.nowVlCn})`; + return `${prefix}${e.rsnExpln}(검증 기준값: ${e.cmprCn} / 현재 입력값: ${e.nowCn})`; }) .filter(Boolean) .join("\n"); @@ -1278,7 +1278,7 @@ const SewerageFinanceInp = () => { {submitOk && } )} - {activeTabStatus?.laeSbmsnSttsCd === "2" && submitOk && ( + {activeTabStatus?.lclgvSbmsnSttsCd === "2" && submitOk && ( )} {showSaveInToolbar && } diff --git a/apps/st/src/components/statistics/input/SeweragePenetrationRateInp.tsx b/apps/st/src/components/statistics/input/SeweragePenetrationRateInp.tsx index 50ea8f99c..18c3e0dfc 100644 --- a/apps/st/src/components/statistics/input/SeweragePenetrationRateInp.tsx +++ b/apps/st/src/components/statistics/input/SeweragePenetrationRateInp.tsx @@ -325,8 +325,8 @@ const SeweragePenetrationRateInp = () => { ); setStatsCd(commonInfo.statsCd); setIsVerificationFailed(isVerificationFailedFromCommonInfo(commonInfo)); - if (statusInfo && statusInfo.laeSbmsnSttsCd) { - if (['2', '3'].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo && statusInfo.lclgvSbmsnSttsCd) { + if (['2', '3'].includes(statusInfo.lclgvSbmsnSttsCd)) { setIsEnterable(false); } else { setIsEnterable(isEnterable); @@ -395,7 +395,7 @@ const SeweragePenetrationRateInp = () => { ...toInputSearchRegion(sidoListRef.current, searchValues), ctpvNm: searchValues?.sido ?? '', statsYr: searchValues?.year ?? '', - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, statsCd: statsCd, }; @@ -501,30 +501,30 @@ const SeweragePenetrationRateInp = () => { sggNm: nullableTrimmedString(d.sggNm), admdstCd: nullableTrimmedString(d.admdstCd), admdstNm: nullableTrimmedString(d.admdstNm), - trbtrNm: nullableTrimmedString(d.trbtrNm), + statsTrbtrNm: nullableTrimmedString(d.statsTrbtrNm), spcCtpnRgnCn: d.spcCtpnRgnCn === '해당없음' ? null : nullableTrimmedString(d.spcCtpnRgnCn), - ts1SwtrmtPpltnCnt: formatNumber(d.ts1SwtrmtPpltnCnt, 'ts1SwtrmtPpltnCnt'), - ts2SwtrmtPpltnCnt: formatNumber(d.ts2SwtrmtPpltnCnt, 'ts2SwtrmtPpltnCnt'), - ts3SwtrmtPpltnCnt: formatNumber(d.ts3SwtrmtPpltnCnt, 'ts3SwtrmtPpltnCnt'), - ts1WwtPrcsPpltnCnt: formatNumber(d.ts1WwtPrcsPpltnCnt, 'ts1WwtPrcsPpltnCnt'), - ts2WwtPrcsPpltnCnt: formatNumber(d.ts2WwtPrcsPpltnCnt, 'ts2WwtPrcsPpltnCnt'), - ts3WwtPrcsPpltnCnt: formatNumber(d.ts3WwtPrcsPpltnCnt, 'ts3WwtPrcsPpltnCnt'), - yetCntnPpltnCnt: formatNumber(d.yetCntnPpltnCnt, 'yetCntnPpltnCnt'), - staaArea: formatNumber(d.staaArea, 'staaArea'), + physSwtrmtPpltnCnt: formatNumber(d.physSwtrmtPpltnCnt, 'physSwtrmtPpltnCnt'), + crtureSwtrmtPpltnCnt: formatNumber(d.crtureSwtrmtPpltnCnt, 'crtureSwtrmtPpltnCnt'), + altdSwtrmtPpltnCnt: formatNumber(d.altdSwtrmtPpltnCnt, 'altdSwtrmtPpltnCnt'), + physWswtPpltnCnt: formatNumber(d.physWswtPpltnCnt, 'physWswtPpltnCnt'), + crtureWswtPpltnCnt: formatNumber(d.crtureWswtPpltnCnt, 'crtureWswtPpltnCnt'), + altdWswtPpltnCnt: formatNumber(d.altdWswtPpltnCnt, 'altdWswtPpltnCnt'), + urftPpltnCnt: formatNumber(d.urftPpltnCnt, 'urftPpltnCnt'), + swtrmtZoneIntnar: formatNumber(d.swtrmtZoneIntnar, 'swtrmtZoneIntnar'), unprcsPpltnCnt: formatNumber(d.unprcsPpltnCnt, 'unprcsPpltnCnt'), - drtwPrcsPpltnCnt: formatNumber(d.drtwPrcsPpltnCnt, 'drtwPrcsPpltnCnt'), + swgdplPpltnCnt: formatNumber(d.swgdplPpltnCnt, 'swgdplPpltnCnt'), spctnkPpltnCnt: formatNumber(d.spctnkPpltnCnt, 'spctnkPpltnCnt'), - staaExcpArea: formatNumber(d.staaExcpArea, 'staaExcpArea'), + swtrmtZoneExtnar: formatNumber(d.swtrmtZoneExtnar, 'swtrmtZoneExtnar'), rmrk: nullableTrimmedString(d.rmrk), wholPpltnCnt: formatNumber(d.wholPpltnCnt, 'wholPpltnCnt'), - wholArea: formatNumber(d.wholArea, 'wholArea'), + whlar: formatNumber(d.whlar, 'whlar'), wholSwtrmtPpltnCnt: formatNumber(d.wholSwtrmtPpltnCnt, 'wholSwtrmtPpltnCnt'), wholPblSwtrmtPpltnCnt: formatNumber(d.wholPblSwtrmtPpltnCnt, 'wholPblSwtrmtPpltnCnt'), - wholWwtPrcsPpltnCnt: formatNumber(d.wholWwtPrcsPpltnCnt, 'wholWwtPrcsPpltnCnt'), - wholStaaExcpPpltnCnt: formatNumber(d.wholStaaExcpPpltnCnt, 'wholStaaExcpPpltnCnt'), - staaPsplyRt: formatNumber(d.staaPsplyRt, 'staaPsplyRt'), - altdPrcsPsplyRt: formatNumber(d.altdPrcsPsplyRt, 'altdPrcsPsplyRt'), + wholWswtPpltnCnt: formatNumber(d.wholWswtPpltnCnt, 'wholWswtPpltnCnt'), + wholStaaOtsdPpltnCnt: formatNumber(d.wholStaaOtsdPpltnCnt, 'wholStaaOtsdPpltnCnt'), + swagePplPsplyRt: formatNumber(d.swagePplPsplyRt, 'swagePplPsplyRt'), + awtrPsplyRt: formatNumber(d.awtrPsplyRt, 'awtrPsplyRt'), sewerInstlRt: formatNumber(d.sewerInstlRt, 'sewerInstlRt'), })); @@ -532,17 +532,17 @@ const SeweragePenetrationRateInp = () => { ...toInputSearchRegion(sidoListRef.current, searchValues), ctpvNm: searchValues?.sido ?? '', statsYr: searchValues?.year ?? '', - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, submitList: convertedData, sewerBzmnArea: footerFromApi?.sewerBzmnArea, - laePicNm: submitInfo.laePicNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laePicTelNo: submitInfo.laePicTelNo, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, }; setGlobalProgressLabel('일반 검증 진행 중...'); @@ -557,7 +557,7 @@ const SeweragePenetrationRateInp = () => { sewer_bzmn_cd: searchValues?.bsnmCd ?? '', stats_cd: statsCd, stats_yr: searchValues?.year ?? '', - lae_sbmsn_stts_cd: (statusInfo?.laeSbmsnSttsCd === '4' ? '4' : '2'), + lae_sbmsn_stts_cd: (statusInfo?.lclgvSbmsnSttsCd === '4' ? '4' : '2'), gen_verify_stts_cd: response.data.nvpassed ? '1' : '2', hb_pass_yn: response.data.isHbPassed, }; @@ -681,37 +681,37 @@ const SeweragePenetrationRateInp = () => { sggNm: nullableTrimmedString(d.sggNm), // 시군구 admdstCd: nullableTrimmedString(d.admdstCd), // 행정코드 admdstNm: nullableTrimmedString(d.admdstNm), // 행정구역명 - trbtrNm: nullableTrimmedString(d.trbtrNm), // 지류 + statsTrbtrNm: nullableTrimmedString(d.statsTrbtrNm), // 지류 spcCtpnRgnCn: d.spcCtpnRgnCn === '해당없음' ? null : nullableTrimmedString(d.spcCtpnRgnCn), // 특별대책지역 // 공공하수처리인구(명) - 물리적/생물학적/고도처리 - ts1SwtrmtPpltnCnt: formatNumber(d.ts1SwtrmtPpltnCnt, 'ts1SwtrmtPpltnCnt'), // 물리적처리 - ts2SwtrmtPpltnCnt: formatNumber(d.ts2SwtrmtPpltnCnt, 'ts2SwtrmtPpltnCnt'), // 생물학적처리 - ts3SwtrmtPpltnCnt: formatNumber(d.ts3SwtrmtPpltnCnt, 'ts3SwtrmtPpltnCnt'), // 고도처리 + physSwtrmtPpltnCnt: formatNumber(d.physSwtrmtPpltnCnt, 'physSwtrmtPpltnCnt'), // 물리적처리 + crtureSwtrmtPpltnCnt: formatNumber(d.crtureSwtrmtPpltnCnt, 'crtureSwtrmtPpltnCnt'), // 생물학적처리 + altdSwtrmtPpltnCnt: formatNumber(d.altdSwtrmtPpltnCnt, 'altdSwtrmtPpltnCnt'), // 고도처리 // 폐수처리인구(명) - 물리적/생물학적/고도처리 - ts1WwtPrcsPpltnCnt: formatNumber(d.ts1WwtPrcsPpltnCnt, 'ts1WwtPrcsPpltnCnt'), - ts2WwtPrcsPpltnCnt: formatNumber(d.ts2WwtPrcsPpltnCnt, 'ts2WwtPrcsPpltnCnt'), - ts3WwtPrcsPpltnCnt: formatNumber(d.ts3WwtPrcsPpltnCnt, 'ts3WwtPrcsPpltnCnt'), - yetCntnPpltnCnt: formatNumber(d.yetCntnPpltnCnt, 'yetCntnPpltnCnt'), // 미접속인구 - staaArea: formatNumber(d.staaArea, 'staaArea'), // 하수처리구역 내 면적(㎢) + physWswtPpltnCnt: formatNumber(d.physWswtPpltnCnt, 'physWswtPpltnCnt'), + crtureWswtPpltnCnt: formatNumber(d.crtureWswtPpltnCnt, 'crtureWswtPpltnCnt'), + altdWswtPpltnCnt: formatNumber(d.altdWswtPpltnCnt, 'altdWswtPpltnCnt'), + urftPpltnCnt: formatNumber(d.urftPpltnCnt, 'urftPpltnCnt'), // 미접속인구 + swtrmtZoneIntnar: formatNumber(d.swtrmtZoneIntnar, 'swtrmtZoneIntnar'), // 하수처리구역 내 면적(㎢) // 하수처리구역 외 unprcsPpltnCnt: formatNumber(d.unprcsPpltnCnt, 'unprcsPpltnCnt'), // 미처리인구 - drtwPrcsPpltnCnt: formatNumber(d.drtwPrcsPpltnCnt, 'drtwPrcsPpltnCnt'), // 오수처리인구 + swgdplPpltnCnt: formatNumber(d.swgdplPpltnCnt, 'swgdplPpltnCnt'), // 오수처리인구 spctnkPpltnCnt: formatNumber(d.spctnkPpltnCnt, 'spctnkPpltnCnt'), // 정화조인구 - staaExcpArea: formatNumber(d.staaExcpArea, 'staaExcpArea'), // 하수처리구역 외 면적(㎢) + swtrmtZoneExtnar: formatNumber(d.swtrmtZoneExtnar, 'swtrmtZoneExtnar'), // 하수처리구역 외 면적(㎢) rmrk: nullableTrimmedString(d.rmrk), // 비고 // 합계·소계(계산필드 저장용) wholPpltnCnt: formatNumber(d.wholPpltnCnt, 'wholPpltnCnt'), // 총인구(명) - wholArea: formatNumber(d.wholArea, 'wholArea'), // 총면적(㎢) + whlar: formatNumber(d.whlar, 'whlar'), // 총면적(㎢) wholSwtrmtPpltnCnt: formatNumber(d.wholSwtrmtPpltnCnt, 'wholSwtrmtPpltnCnt'), // 하수처리구역 내 합계 wholPblSwtrmtPpltnCnt: formatNumber(d.wholPblSwtrmtPpltnCnt, 'wholPblSwtrmtPpltnCnt'), // 공공하수처리인구 소계 - wholWwtPrcsPpltnCnt: formatNumber(d.wholWwtPrcsPpltnCnt, 'wholWwtPrcsPpltnCnt'), // 폐수처리인구 소계 - wholStaaExcpPpltnCnt: formatNumber(d.wholStaaExcpPpltnCnt, 'wholStaaExcpPpltnCnt'), // 하수처리구역 외 합계 + wholWswtPpltnCnt: formatNumber(d.wholWswtPpltnCnt, 'wholWswtPpltnCnt'), // 폐수처리인구 소계 + wholStaaOtsdPpltnCnt: formatNumber(d.wholStaaOtsdPpltnCnt, 'wholStaaOtsdPpltnCnt'), // 하수처리구역 외 합계 // 보급률(%) - staaPsplyRt: formatNumber(d.staaPsplyRt, 'staaPsplyRt'), // 공공하수처리구역 인구보급률 - altdPrcsPsplyRt: formatNumber(d.altdPrcsPsplyRt, 'altdPrcsPsplyRt'), // 고도처리 인구보급률 + swagePplPsplyRt: formatNumber(d.swagePplPsplyRt, 'swagePplPsplyRt'), // 공공하수처리구역 인구보급률 + awtrPsplyRt: formatNumber(d.awtrPsplyRt, 'awtrPsplyRt'), // 고도처리 인구보급률 sewerInstlRt: formatNumber(d.sewerInstlRt, 'sewerInstlRt'), // 하수도 설치율 })); @@ -719,7 +719,7 @@ const SeweragePenetrationRateInp = () => { ...toInputSearchRegion(sidoListRef.current, searchValues), ctpvNm: searchValues?.sido ?? '', // 시도 statsYr: searchValues?.year ?? '', // 통계 연도 - userId: userInfo.userUnqId, // 사용자 + userUuid: userInfo.userUnqId, // 사용자 saveList: convertedData, // 저장 데이터 sewerBzmnArea: footerFromApi?.sewerBzmnArea, // 행정참고자료면적 }; @@ -763,7 +763,7 @@ const SeweragePenetrationRateInp = () => { ...toInputSearchRegion(sidoListRef.current, searchValues), ctpvNm: searchValues?.sido ?? '', statsYr: searchValues?.year ?? '', - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCd, }; @@ -794,7 +794,7 @@ const SeweragePenetrationRateInp = () => { const submitOk = isSubmitOkForToolbar(sidoList, toolbarSearchContext); const inputPeriodCurrent = isInputPeriodCurrent(periodCheckList); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === '2'; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === '2'; const baseShowSaveInToolbar = (isEnterable || isAdminInfo) && inputPeriodCurrent && gugunOkOrNotDoList; const baseShowEnterableToolbarButtons = isEnterable && gugunOkOrNotDoList; @@ -834,7 +834,7 @@ const SeweragePenetrationRateInp = () => { {submitOk && submitFunc(false)} />} )} - {statusInfo?.laeSbmsnSttsCd === '2' && submitOk && } + {statusInfo?.lclgvSbmsnSttsCd === '2' && submitOk && } {showSaveInToolbar && } @@ -878,7 +878,7 @@ const SeweragePenetrationRateInp = () => { .map((e) => { const prefix = e.vrfcCd === 'IMR' ? '시계열 검증 - ' : (e.vrfcCd === 'NV' ? '일반검증 - ' : '모집단 검증 -'); return `${prefix}${e.rsnExpln} - (검증 기준값: ${e.compVlCn} / 현재 입력값: ${e.nowVlCn})`; + (검증 기준값: ${e.cmprCn} / 현재 입력값: ${e.nowCn})`; }) .filter(Boolean) .join('\n'); diff --git a/apps/st/src/components/statistics/input/SewerageServiceLevelInp.tsx b/apps/st/src/components/statistics/input/SewerageServiceLevelInp.tsx index c5a385c43..50e9b3efc 100644 --- a/apps/st/src/components/statistics/input/SewerageServiceLevelInp.tsx +++ b/apps/st/src/components/statistics/input/SewerageServiceLevelInp.tsx @@ -119,8 +119,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (["2", "3"].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (["2", "3"].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -156,7 +156,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === "2"; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === "2"; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = isSubmitted && periodEnterable && gugunOk; @@ -223,18 +223,18 @@ function buildComplaintSaveList( admdstCd: nullableTrimmedString(d.admdstCd), admdstNm: nullableTrimmedString(d.admdstNm), swtrmtPpltnCnt: formatNumber(d.swtrmtPpltnCnt, "swtrmtPpltnCnt"), - dschgWqCnt: formatNumber(d.dschgWqCnt, "dschgWqCnt"), - odorCnt: formatNumber(d.odorCnt, "odorCnt"), - ldsCnt: formatNumber(d.ldsCnt, "ldsCnt"), - plltnAcdntCnt: formatNumber(d.plltnAcdntCnt, "plltnAcdntCnt"), - swagePplCnt: formatNumber(d.swagePplCnt, "swagePplCnt"), - sewerCrgAmt: formatNumber(d.sewerCrgAmt, "sewerCrgAmt"), - etcCnt: formatNumber(d.etcCnt, "etcCnt"), + cvlcptDschgWq: formatNumber(d.cvlcptDschgWq, "cvlcptDschgWq"), + cvlcptOdorCnt: formatNumber(d.cvlcptOdorCnt, "cvlcptOdorCnt"), + cvlcptDrgCnt: formatNumber(d.cvlcptDrgCnt, "cvlcptDrgCnt"), + cvlcptMnhlCnt: formatNumber(d.cvlcptMnhlCnt, "cvlcptMnhlCnt"), + cvlcptSpctnkCnt: formatNumber(d.cvlcptSpctnkCnt, "cvlcptSpctnkCnt"), + cvlcptSewerCrg: formatNumber(d.cvlcptSewerCrg, "cvlcptSewerCrg"), + cvlcptEtcCnt: formatNumber(d.cvlcptEtcCnt, "cvlcptEtcCnt"), rmrk: nullableTrimmedString(d.rmrk), - whol: formatNumber(d.whol, "whol"), - crtrPpltnCvlcptEvntcsCnt: formatNumber( - d.crtrPpltnCvlcptEvntcsCnt, - "crtrPpltnCvlcptEvntcsCnt", + cvlcptWholCnt: formatNumber(d.cvlcptWholCnt, "cvlcptWholCnt"), + crtrPpltnCvlcptCnt: formatNumber( + d.crtrPpltnCvlcptCnt, + "crtrPpltnCvlcptCnt", ), })); } @@ -250,15 +250,15 @@ function buildResidentFriendlyFactSaveList( swtrmtFcltCd: nullableTrimmedString(d.swtrmtFcltCd), swtrmtFcltNm: nullableTrimmedString(d.swtrmtFcltNm), fcltSn: nullableTrimmedString(d.fcltSn), - tmplntArea: formatNumber(d.tmplntArea, "tmplntArea"), - brkFcltArea: formatNumber(d.brkFcltArea, "brkFcltArea"), + stpar: formatNumber(d.stpar, "stpar"), + brkFcar: formatNumber(d.brkFcar, "brkFcar"), childFrshpSpacArea: formatNumber(d.childFrshpSpacArea, "childFrshpSpacArea"), - bdySportsFcltArea: formatNumber(d.bdySportsFcltArea, "bdySportsFcltArea"), - sportsFcltArea: formatNumber(d.sportsFcltArea, "sportsFcltArea"), - pkltArea: formatNumber(d.pkltArea, "pkltArea"), - eduMultiFcltArea: formatNumber(d.eduMultiFcltArea, "eduMultiFcltArea"), + bdySportsFcar: formatNumber(d.bdySportsFcar, "bdySportsFcar"), + sportsFcar: formatNumber(d.sportsFcar, "sportsFcar"), + pkltar: formatNumber(d.pkltar, "pkltar"), + eduMultiFcar: formatNumber(d.eduMultiFcar, "eduMultiFcar"), wtlndMakeArea: formatNumber(d.wtlndMakeArea, "wtlndMakeArea"), - etcCnt: formatNumber(d.etcCnt, "etcCnt"), + othrar: formatNumber(d.othrar, "othrar"), rmrk: nullableTrimmedString(d.rmrk), })); } @@ -772,14 +772,14 @@ const SewerageServiceLevelInp = () => { statsYr: lastSearchedValues.year ?? "", ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - laePicNm: submitInfo.laePicNm, - laePicTelNo: submitInfo.laePicTelNo, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, }; const verificationQuery = { @@ -807,13 +807,13 @@ const SewerageServiceLevelInp = () => { const response = isComplaintTab ? await statisticsInputSewerageServiceLevelApi.submitComplaintList({ ...submitInfoBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), submitList: complaintSubmitList, }) : await statisticsInputSewerageServiceLevelApi.submitResidentFriendlyFactList({ ...submitInfoBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), noApplicable, submitList: residentSubmitList, @@ -835,7 +835,7 @@ const SewerageServiceLevelInp = () => { sewer_bzmn_cd: lastSearchedValues?.bsnmCd ?? "", stats_cd: statsCdForTab, stats_yr: lastSearchedValues.year ?? "", - lae_sbmsn_stts_cd: activeTabStatus?.laeSbmsnSttsCd === "4" ? "4" : "2", + lae_sbmsn_stts_cd: activeTabStatus?.lclgvSbmsnSttsCd === "4" ? "4" : "2", gen_verify_stts_cd: nvpassed ? "1" : "2", hb_pass_yn: response.data?.isHbPassed, }; @@ -941,7 +941,7 @@ const SewerageServiceLevelInp = () => { const response = await statisticsInputSewerageServiceLevelApi.saveComplaintList({ ...baseRequest, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), saveList, }); @@ -967,7 +967,7 @@ const SewerageServiceLevelInp = () => { await statisticsInputSewerageServiceLevelApi.saveResidentFriendlyFactList( { ...baseRequest, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), noApplicable, saveList, @@ -1021,7 +1021,7 @@ const SewerageServiceLevelInp = () => { ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), ctpvNm: lastSearchedValues.sido ?? "", statsYr: lastSearchedValues.year ?? "", - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCdForTab, }; @@ -1156,7 +1156,7 @@ const SewerageServiceLevelInp = () => { : e.vrfcCd === "NV" ? "일반검증 - " : "모집단 검증 - "; - return `${prefix}${e.rsnExpln}(검증 기준값: ${e.compVlCn} / 현재 입력값: ${e.nowVlCn})`; + return `${prefix}${e.rsnExpln}(검증 기준값: ${e.cmprCn} / 현재 입력값: ${e.nowCn})`; }) .filter(Boolean) .join("\n"); @@ -1202,7 +1202,7 @@ const SewerageServiceLevelInp = () => { {submitOk && } )} - {activeTabStatus?.laeSbmsnSttsCd === "2" && submitOk && ( + {activeTabStatus?.lclgvSbmsnSttsCd === "2" && submitOk && ( )} {showSaveInToolbar && } diff --git a/apps/st/src/components/statistics/input/StatsInputStatusInp.tsx b/apps/st/src/components/statistics/input/StatsInputStatusInp.tsx index 7a4ac00bd..03ea7e870 100644 --- a/apps/st/src/components/statistics/input/StatsInputStatusInp.tsx +++ b/apps/st/src/components/statistics/input/StatsInputStatusInp.tsx @@ -176,8 +176,8 @@ const StatsInputStatusInp = () => { setIsApproveLoading(true); try { const userInfo = await getUserInfo(); - const mdfrId = (userInfo.userUnqId ?? "").trim(); - if (!mdfrId) { + const mdfrUuid = (userInfo.userUnqId ?? "").trim(); + if (!mdfrUuid) { alert("수정자 ID를 확인할 수 없습니다."); return; } @@ -189,7 +189,7 @@ const StatsInputStatusInp = () => { .map((row) => { const statsCd = String(row.statsCd ?? "").trim(); const sewerBzmnCd = String(row.sewerBzmnCd ?? sewerBzmnCdDefault).trim(); - return { statsYr, sewerBzmnCd, statsCd, mdfrId }; + return { statsYr, sewerBzmnCd, statsCd, mdfrUuid }; }) .filter((item) => item.statsCd.length > 0); diff --git a/apps/st/src/components/statistics/input/SubmitDailog.tsx b/apps/st/src/components/statistics/input/SubmitDailog.tsx index 2dd0b35a5..d804ece3a 100644 --- a/apps/st/src/components/statistics/input/SubmitDailog.tsx +++ b/apps/st/src/components/statistics/input/SubmitDailog.tsx @@ -40,7 +40,7 @@ function formatPhoneWithHyphen(value: string): string { return `${digits.slice(0, 3)}-${digits.slice(3, 6)}-${digits.slice(6, 10)}`; } -const PHONE_FIELDS: (keyof StatisticsInputSubmitInfoFormData)[] = ["laePicTelNo", "laeIdfrTelNo"]; +const PHONE_FIELDS: (keyof StatisticsInputSubmitInfoFormData)[] = ["lclgvPicTelnoCn", "lclgvIdfrTelnoCn"]; interface SubmitDialogProps { open: boolean; @@ -56,26 +56,26 @@ interface SubmitDialogProps { } const defaultValues: StatisticsInputSubmitInfoFormData = { - laePicNm: "", - laeKbrdrJbgdNm: "", - laeKbrdrDeptNm: "", - laePicTelNo: "", - laeIdfrNm: "", - laeIdfrJbgdNm: "", - laeIdfrDeptNm: "", - laeIdfrTelNo: "", + lclgvPicNm: "", + lclgvKbrdrJbgdNm: "", + lclgvKbrdrDeptNm: "", + lclgvPicTelnoCn: "", + lclgvIdfrNm: "", + lclgvIdfrJbgdNm: "", + lclgvIdfrDeptNm: "", + lclgvIdfrTelnoCn: "", }; function statusInfoToFormData(info: SewerageStatusInfo): StatisticsInputSubmitInfoFormData { return { - laePicNm: info.laePicNm ?? "", - laeKbrdrJbgdNm: info.laeKbrdrJbgdNm ?? "", - laeKbrdrDeptNm: info.laeKbrdrDeptNm ?? "", - laePicTelNo: info.laePicTelNo ?? "", - laeIdfrNm: info.laeIdfrNm ?? "", - laeIdfrJbgdNm: info.laeIdfrJbgdNm ?? "", - laeIdfrDeptNm: info.laeIdfrDeptNm ?? "", - laeIdfrTelNo: info.laeIdfrTelNo ?? "", + lclgvPicNm: info.lclgvPicNm ?? "", + lclgvKbrdrJbgdNm: info.lclgvKbrdrJbgdNm ?? "", + lclgvKbrdrDeptNm: info.lclgvKbrdrDeptNm ?? "", + lclgvPicTelnoCn: info.lclgvPicTelnoCn ?? "", + lclgvIdfrNm: info.lclgvIdfrNm ?? "", + lclgvIdfrJbgdNm: info.lclgvIdfrJbgdNm ?? "", + lclgvIdfrDeptNm: info.lclgvIdfrDeptNm ?? "", + lclgvIdfrTelnoCn: info.lclgvIdfrTelnoCn ?? "", }; }; @@ -115,14 +115,14 @@ const SubmitDailog = ({ } const rows: { name: keyof StatisticsInputSubmitInfoFormData; label: string; placeholder: string }[] = [ - { name: "laePicNm", label: "작성자 명", placeholder: "작성자 명 입력" }, - { name: "laeKbrdrJbgdNm", label: "작성자 직제", placeholder: "작성자 직제 입력" }, - { name: "laeKbrdrDeptNm", label: "작성자 부서", placeholder: "작성자 부서 입력" }, - { name: "laePicTelNo", label: "작성자 연락처", placeholder: "작성자 연락처 입력" }, - { name: "laeIdfrNm", label: "승인자명", placeholder: "승인자명 입력" }, - { name: "laeIdfrJbgdNm", label: "승인자 직제", placeholder: "승인자 직제 입력" }, - { name: "laeIdfrDeptNm", label: "승인자 부서", placeholder: "승인자 부서 입력" }, - { name: "laeIdfrTelNo", label: "승인자 연락처", placeholder: "승인자 연락처" }, + { name: "lclgvPicNm", label: "작성자 명", placeholder: "작성자 명 입력" }, + { name: "lclgvKbrdrJbgdNm", label: "작성자 직제", placeholder: "작성자 직제 입력" }, + { name: "lclgvKbrdrDeptNm", label: "작성자 부서", placeholder: "작성자 부서 입력" }, + { name: "lclgvPicTelnoCn", label: "작성자 연락처", placeholder: "작성자 연락처 입력" }, + { name: "lclgvIdfrNm", label: "승인자명", placeholder: "승인자명 입력" }, + { name: "lclgvIdfrJbgdNm", label: "승인자 직제", placeholder: "승인자 직제 입력" }, + { name: "lclgvIdfrDeptNm", label: "승인자 부서", placeholder: "승인자 부서 입력" }, + { name: "lclgvIdfrTelnoCn", label: "승인자 연락처", placeholder: "승인자 연락처" }, ]; return ( diff --git a/apps/st/src/components/statistics/input/WaterReuseInp.tsx b/apps/st/src/components/statistics/input/WaterReuseInp.tsx index 5d38fae57..bf0c83d56 100644 --- a/apps/st/src/components/statistics/input/WaterReuseInp.tsx +++ b/apps/st/src/components/statistics/input/WaterReuseInp.tsx @@ -158,8 +158,8 @@ const computeTabEnterable = ( statusInfo: SewerageStatusInfo | null | undefined, periodEnterable: boolean, ): boolean => { - if (statusInfo?.laeSbmsnSttsCd) { - if (["2", "3"].includes(statusInfo.laeSbmsnSttsCd)) { + if (statusInfo?.lclgvSbmsnSttsCd) { + if (["2", "3"].includes(statusInfo.lclgvSbmsnSttsCd)) { return false; } return periodEnterable; @@ -195,7 +195,7 @@ function computeTabToolbarSnapshot( ): TabToolbarSnapshot { const gugunOk = buildGugunOkForToolbar(searchContext); const enterable = computeTabEnterable(statusInfo, periodEnterable); - const isSubmitted = statusInfo?.laeSbmsnSttsCd === "2"; + const isSubmitted = statusInfo?.lclgvSbmsnSttsCd === "2"; const showSaveInToolbar = (enterable || isAdminInfo) && periodEnterable && gugunOk; const showEnterableToolbarButtons = enterable && gugunOk; const showSubmittedInInputPeriodToolbar = isSubmitted && periodEnterable && gugunOk; @@ -320,12 +320,12 @@ function buildRecycledWaterStatusSaveItem( lglTrgtYn: nullableTrimmedString(row.lglTrgtYn), cmptnStrtYmd: toCompactYmdOrNull(row.cmptnStrtYmd), oprtngStrtYmd: toCompactYmdOrNull(row.oprtngStrtYmd), - archWholArea: toGridNumber(row.archWholArea), + archWhlar: toGridNumber(row.archWhlar), prcsCpct: toGridNumber(row.prcsCpct), - wtrUseQnt: toGridNumber(row.wtrUseQnt), + ruswtrWtrUsqty: toGridNumber(row.ruswtrWtrUsqty), ruswtrUtztnQnt: toGridNumber(row.ruswtrUtztnQnt), sbstCntUtztnQnt: toGridNumber(row.sbstCntUtztnQnt), - mnUsgCn: nullableTrimmedString(row.mnUsgCn), + ruswtrUsgCn: nullableTrimmedString(row.ruswtrUsgCn), ruswtrOperAmt: toGridNumber(row.ruswtrOperAmt), rmrk: nullableTrimmedString(row.rmrk), }; @@ -341,14 +341,14 @@ function buildRainFallUtilFactStatusSaveItem( admdstNm, fcltSn: nullableTrimmedString(row.fcltSn), fcltNm: nullableTrimmedString(row.fcltNm), - bdstTypCn: nullableTrimmedString(row.bdstTypCn), + bdstSeCn: nullableTrimmedString(row.bdstSeCn), fcltPstnCn: nullableTrimmedString(row.fcltPstnCn), lglTrgtYn: nullableTrimmedString(row.lglTrgtYn), - cmptYmd: toCompactYmdOrNull(row.cmptYmd), - instlAmt: toGridNumber(row.instlAmt), - rcptMynCn: nullableTrimmedString(row.rcptMynCn), - filtrPrcsFcltYnExpln: nullableTrimmedString(row.filtrPrcsFcltYnExpln), - impdCpct: toGridNumber(row.impdCpct), + cmptnYmd: toCompactYmdOrNull(row.cmptnYmd), + fcltInstlAmt: toGridNumber(row.fcltInstlAmt), + rcptKndCn: nullableTrimmedString(row.rcptKndCn), + filtrPrcsFcltExpln: nullableTrimmedString(row.filtrPrcsFcltExpln), + fcltRtntnkCpct: toGridNumber(row.fcltRtntnkCpct), anlUseQnt: toGridNumber(row.anlUseQnt), exlnUtlzUsgExpln: nullableTrimmedString(row.exlnUtlzUsgExpln), anlOperAmt: toGridNumber(row.anlOperAmt), @@ -477,7 +477,7 @@ function mapRainFallUtilFactStatusListToGridRows( { ctpvNm, ...rest, - cmptYmd: formatCompactYmdForGrid(item.cmptYmd), + cmptnYmd: formatCompactYmdForGrid(item.cmptnYmd), }, ])[0] as GridRowWithVerification; if (verificationResult) row.verificationResult = verificationResult; @@ -1145,14 +1145,14 @@ const WaterReuseInp = () => { statsYr: lastSearchedValues.year ?? "", ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - laePicNm: submitInfo.laePicNm, - laePicTelNo: submitInfo.laePicTelNo, - laeKbrdrDeptNm: submitInfo.laeKbrdrDeptNm, - laeKbrdrJbgdNm: submitInfo.laeKbrdrJbgdNm, - laeIdfrNm: submitInfo.laeIdfrNm, - laeIdfrTelNo: submitInfo.laeIdfrTelNo, - laeIdfrDeptNm: submitInfo.laeIdfrDeptNm, - laeIdfrJbgdNm: submitInfo.laeIdfrJbgdNm, + lclgvPicNm: submitInfo.lclgvPicNm, + lclgvPicTelnoCn: submitInfo.lclgvPicTelnoCn, + lclgvKbrdrDeptNm: submitInfo.lclgvKbrdrDeptNm, + lclgvKbrdrJbgdNm: submitInfo.lclgvKbrdrJbgdNm, + lclgvIdfrNm: submitInfo.lclgvIdfrNm, + lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn, + lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm, + lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm, ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}), }; @@ -1211,7 +1211,7 @@ const WaterReuseInp = () => { response = await statisticsInputWaterReuseApi.submitPublicSewageTreatWaterReuse({ ...submitRequestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, noApplicable, submitList, }); @@ -1233,7 +1233,7 @@ const WaterReuseInp = () => { const articleSubmitRequest = { ...submitRequestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(noApplicable ? { noApplicable: true } : {}), }; @@ -1350,7 +1350,7 @@ const WaterReuseInp = () => { stats_cd: statsCdForTab, stats_yr: lastSearchedValues.year ?? "", lae_sbmsn_stts_cd: - activeTabStatus?.laeSbmsnSttsCd === "4" ? "4" : "2", + activeTabStatus?.lclgvSbmsnSttsCd === "4" ? "4" : "2", gen_verify_stts_cd: nvpassed ? "1" : "2", hb_pass_yn: response.data?.isHbPassed, }; @@ -1456,7 +1456,7 @@ const WaterReuseInp = () => { const response = await statisticsInputWaterReuseApi.savePublicSewageTreatWaterReuse({ ...requestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, noApplicable, saveList, }); @@ -1509,7 +1509,7 @@ const WaterReuseInp = () => { const userInfo = await getUserInfo(); const response = await statisticsInputWaterReuseApi.saveRecycledWaterStatus({ ...requestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(noApplicable ? { noApplicable: true } : {}), saveList, deleteList, @@ -1570,7 +1570,7 @@ const WaterReuseInp = () => { const response = await statisticsInputWaterReuseApi.saveRainFallUtilFactStatus({ ...requestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(noApplicable ? { noApplicable: true } : {}), saveList, deleteList, @@ -1634,7 +1634,7 @@ const WaterReuseInp = () => { await statisticsInputWaterReuseApi.saveTreatWaterReuseDesignConstStatus( { ...requestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(noApplicable ? { noApplicable: true } : {}), saveList, deleteList, @@ -1699,7 +1699,7 @@ const WaterReuseInp = () => { await statisticsInputWaterReuseApi.saveTreatWaterReuseBusinessApprStatus( { ...requestBase, - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, ...(noApplicable ? { noApplicable: true } : {}), saveList, deleteList, @@ -1742,7 +1742,7 @@ const WaterReuseInp = () => { statsYr: lastSearchedValues.year ?? "", ctpvNm: lastSearchedValues.sido ?? "", ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), - userId: userInfo.userUnqId, + userUuid: userInfo.userUnqId, }; const response = @@ -1902,7 +1902,7 @@ const WaterReuseInp = () => { ...toInputSearchRegion(sidoListRef.current, lastSearchedValues), ctpvNm: lastSearchedValues.sido ?? "", statsYr: lastSearchedValues.year ?? "", - mdfrId: userInfo.userUnqId, + mdfrUuid: userInfo.userUnqId, statsCd: statsCdForTab, }; @@ -2072,7 +2072,7 @@ const WaterReuseInp = () => { : e.vrfcCd === "NV" ? "일반검증 - " : "모집단 검증 - "; - return `${prefix}${e.rsnExpln}(검증 기준값: ${e.compVlCn} / 현재 입력값: ${e.nowVlCn})`; + return `${prefix}${e.rsnExpln}(검증 기준값: ${e.cmprCn} / 현재 입력값: ${e.nowCn})`; }) .filter(Boolean) .join("\n"); @@ -2118,7 +2118,7 @@ const WaterReuseInp = () => { {submitOk && } )} - {activeTabStatus?.laeSbmsnSttsCd === "2" && submitOk && ( + {activeTabStatus?.lclgvSbmsnSttsCd === "2" && submitOk && ( )} {showSaveInToolbar && } diff --git a/apps/st/src/components/statistics/management/LogHistoryDetailDialog.tsx b/apps/st/src/components/statistics/management/LogHistoryDetailDialog.tsx index 933ebda38..d866c2cbe 100644 --- a/apps/st/src/components/statistics/management/LogHistoryDetailDialog.tsx +++ b/apps/st/src/components/statistics/management/LogHistoryDetailDialog.tsx @@ -75,9 +75,9 @@ export function LogHistoryDetailDialog({ if (!row) return; const sn = row.statsLogSn; - const rgtrId = - row.rgtrId != null && String(row.rgtrId).trim() !== "" - ? String(row.rgtrId).trim() + const rgtrUuid = + row.rgtrUuid != null && String(row.rgtrUuid).trim() !== "" + ? String(row.rgtrUuid).trim() : ""; let cancelled = false; @@ -88,8 +88,8 @@ export function LogHistoryDetailDialog({ try { const userLookupPromise = - rgtrId !== "" - ? UserApi.findByUserUnqId(rgtrId).catch(() => { + rgtrUuid !== "" + ? UserApi.findByUserUnqId(rgtrUuid).catch(() => { return null; }) : Promise.resolve(null); diff --git a/apps/st/src/components/statistics/management/LogHistoryDetailsNestedDialog.tsx b/apps/st/src/components/statistics/management/LogHistoryDetailsNestedDialog.tsx index bc6069847..6181ddf0c 100644 --- a/apps/st/src/components/statistics/management/LogHistoryDetailsNestedDialog.tsx +++ b/apps/st/src/components/statistics/management/LogHistoryDetailsNestedDialog.tsx @@ -48,7 +48,7 @@ export function LogHistoryDetailsNestedDialog({ 조합순번: {" "} - {item.eqtnCombSeq ?? "-"} + {item.fmlaCombSeq ?? "-"}

@@ -60,7 +60,7 @@ export function LogHistoryDetailsNestedDialog({ 비교연산: {" "} - {item.cmprOpert ?? "-"} + {item.cmprArtopnCn ?? "-"}

@@ -72,13 +72,13 @@ export function LogHistoryDetailsNestedDialog({ 한글 수식: {" "} - {item.kornArtopnEqtnCn ?? "-"} + {item.kornArtopnFmlaCn ?? "-"}

영문 수식: {" "} - {item.engArtopnEqtnCn ?? "-"} + {item.engArtopnFmlaCn ?? "-"}

diff --git a/apps/st/src/components/statistics/management/StatisticsInputManagement.tsx b/apps/st/src/components/statistics/management/StatisticsInputManagement.tsx index 7c6f9731a..87f27c4ce 100644 --- a/apps/st/src/components/statistics/management/StatisticsInputManagement.tsx +++ b/apps/st/src/components/statistics/management/StatisticsInputManagement.tsx @@ -20,14 +20,14 @@ import type { SearchFormValues } from "@/components/type/SearchForm.type"; import { toGridRows } from "@/components/util/grid/gridFunction"; /** API `YYYYMMDD` 등 → Date */ -function seTypeToDisplayLabel(seType: StatsInputPeriodItem["seType"]): string { - if (seType === "INPT") return "입력"; - if (seType === "VRFC") return "검증"; - return seType; +function seTypeToDisplayLabel(seTypeCd: StatsInputPeriodItem["seTypeCd"]): string { + if (seTypeCd === "INPT") return "입력"; + if (seTypeCd === "VRFC") return "검증"; + return seTypeCd; } function rowSeTypeToCode(row: Record): "INPT" | "VRFC" { - const v = String(row.seType ?? ""); + const v = String(row.seTypeCd ?? ""); if (v === "INPT" || v === "입력") return "INPT"; if (v === "VRFC" || v === "검증") return "VRFC"; return "INPT"; @@ -86,16 +86,16 @@ const StatisticsInputManagement = () => { const params: StatsInputPeriodListRequest = { statsYr: values.year, ...(values.clsfCd && values.clsfCd !== "ALL" - ? { seType: values.clsfCd } + ? { seTypeCd: values.clsfCd } : {}), }; const res = await statisticsApi.getStatsInputPeriodList(params); if (res.status === "success" && Array.isArray(res.data)) { const rowsForGrid = res.data.map((row) => ({ ...row, - seType: seTypeToDisplayLabel(row.seType), - inptBgngYmd: formatYmdForDisplay(row.inptBgngYmd), - inptEndYmd: formatYmdForDisplay(row.inptEndYmd), + seTypeCd: seTypeToDisplayLabel(row.seTypeCd), + bgngYmd: formatYmdForDisplay(row.bgngYmd), + endYmd: formatYmdForDisplay(row.endYmd), [PERIOD_DETAIL_FIELD]: "상세정보", })); setRowData(toGridRows(rowsForGrid)); @@ -138,22 +138,22 @@ const StatisticsInputManagement = () => { const openPeriodDetailForRow = useCallback( async (row: Record) => { - const seCdRaw = row.seCd; - const seCdNum = - typeof seCdRaw === "number" - ? seCdRaw - : parseInt(String(seCdRaw ?? ""), 10); - const seCd = Number.isFinite(seCdNum) ? seCdNum : 0; + const cyclSeNoRaw = row.cyclSeNo; + const cyclSeNoNum = + typeof cyclSeNoRaw === "number" + ? cyclSeNoRaw + : parseInt(String(cyclSeNoRaw ?? ""), 10); + const cyclSeNo = Number.isFinite(cyclSeNoNum) ? cyclSeNoNum : 0; const statsYr = String(row.statsYr ?? ""); - const seType = rowSeTypeToCode(row); + const seTypeCd = rowSeTypeToCode(row); const extSchdlId = parseExtSchdlId(row.extSchdlId); try { setIsLoading(true); const res = await statisticsApi.getStatsInputPeriodDetail({ statsYr, - seType, - seCd, + seTypeCd, + cyclSeNo, ...(extSchdlId != null ? { extSchdlId } : {}), }); @@ -168,13 +168,13 @@ const StatisticsInputManagement = () => { setPeriodDialogInitial({ extSchdlId: detailExtSchdlId, statsYr: String(detail.statsYr ?? statsYr), - seType: detail.seType === "VRFC" ? "VRFC" : "INPT", - seCd: - typeof detail.seCd === "number" && Number.isFinite(detail.seCd) - ? detail.seCd - : seCd, - inptBgngYmd: parseYmdToDate(detail.inptBgngYmd), - inptEndYmd: parseYmdToDate(detail.inptEndYmd), + seTypeCd: detail.seTypeCd === "VRFC" ? "VRFC" : "INPT", + cyclSeNo: + typeof detail.cyclSeNo === "number" && Number.isFinite(detail.cyclSeNo) + ? detail.cyclSeNo + : cyclSeNo, + bgngYmd: parseYmdToDate(detail.bgngYmd), + endYmd: parseYmdToDate(detail.endYmd), }); setPeriodDialogOpen(true); } catch { @@ -202,20 +202,20 @@ const StatisticsInputManagement = () => { editable: false, }, { - name: "seType", - fieldName: "seType", + name: "seTypeCd", + fieldName: "seTypeCd", header: { text: "분류" }, editable: false, }, { - name: "inptBgngYmd", - fieldName: "inptBgngYmd", + name: "bgngYmd", + fieldName: "bgngYmd", header: { text: "시작일" }, editable: false, }, { - name: "inptEndYmd", - fieldName: "inptEndYmd", + name: "endYmd", + fieldName: "endYmd", header: { text: "종료일" }, editable: false, }, @@ -231,9 +231,9 @@ const StatisticsInputManagement = () => { const columnLayout = [ "statsYr", - "seType", - "inptBgngYmd", - "inptEndYmd", + "seTypeCd", + "bgngYmd", + "endYmd", PERIOD_DETAIL_FIELD, ]; diff --git a/apps/st/src/components/statistics/management/StatisticsInputPeriodDialog.tsx b/apps/st/src/components/statistics/management/StatisticsInputPeriodDialog.tsx index 8ec3c30ec..6ebcfc66e 100644 --- a/apps/st/src/components/statistics/management/StatisticsInputPeriodDialog.tsx +++ b/apps/st/src/components/statistics/management/StatisticsInputPeriodDialog.tsx @@ -33,10 +33,10 @@ import { getUserInfo } from "../../../../../../packages/common/components/src/ap export type StatisticsInputPeriodDialogValues = { extSchdlId?: number; statsYr: string; - seType: "INPT" | "VRFC"; - seCd: number; - inptBgngYmd: Date | undefined; - inptEndYmd: Date | undefined; + seTypeCd: "INPT" | "VRFC"; + cyclSeNo: number; + bgngYmd: Date | undefined; + endYmd: Date | undefined; }; export type StatisticsInputPeriodDialogMode = "edit" | "create"; @@ -76,33 +76,33 @@ export function StatisticsInputPeriodDialog({ const { setMessage: alert } = useAlertStore((state) => state); const { confirm } = useConfirm(); const [statsYr, setStatsYr] = useState(""); - const [seType, setSeType] = useState<"INPT" | "VRFC" | null>(null); - const [seCdInput, setSeCdInput] = useState(""); - const [inptBgngYmd, setInptBgngYmd] = useState(undefined); - const [inptEndYmd, setInptEndYmd] = useState(undefined); + const [seTypeCd, setSeTypeCd] = useState<"INPT" | "VRFC" | null>(null); + const [cyclSeNoInput, setCyclSeNoInput] = useState(""); + const [bgngYmd, setBgngYmd] = useState(undefined); + const [endYmd, setEndYmd] = useState(undefined); const [isSubmitting, setIsSubmitting] = useState(false); useEffect(() => { if (!open) return; if (mode === "create") { setStatsYr(normalizeStatsYrInput(createDefaultStatsYr ?? "")); - setSeType(null); - setSeCdInput("0"); - setInptBgngYmd(undefined); - setInptEndYmd(undefined); + setSeTypeCd(null); + setCyclSeNoInput("0"); + setBgngYmd(undefined); + setEndYmd(undefined); return; } if (!initial) return; setStatsYr(normalizeStatsYrInput(String(initial.statsYr ?? ""))); - setSeType(initial.seType); - setSeCdInput(String(Number.isFinite(initial.seCd) ? initial.seCd : 0)); - setInptBgngYmd(initial.inptBgngYmd); - setInptEndYmd(initial.inptEndYmd); + setSeTypeCd(initial.seTypeCd); + setCyclSeNoInput(String(Number.isFinite(initial.cyclSeNo) ? initial.cyclSeNo : 0)); + setBgngYmd(initial.bgngYmd); + setEndYmd(initial.endYmd); }, [open, mode, initial, createDefaultStatsYr]); const handleSave = async () => { - const bgng = formatDateToYmd(inptBgngYmd); - const end = formatDateToYmd(inptEndYmd); + const bgng = formatDateToYmd(bgngYmd); + const end = formatDateToYmd(endYmd); if (!bgng || !end) { alert("시작일과 종료일을 선택해주세요."); return; @@ -111,18 +111,18 @@ export function StatisticsInputPeriodDialog({ alert("시작일은 종료일보다 늦을 수 없습니다."); return; } - if (seType === null) { + if (seTypeCd === null) { alert("분류를 선택해주세요."); return; } - const seCdParsed = + const cyclSeNoParsed = mode === "create" ? 0 : (() => { - const n = parseInt(seCdInput, 10); + const n = parseInt(cyclSeNoInput, 10); return Number.isFinite(n) && n >= 0 ? n : NaN; })(); - if (mode === "edit" && !Number.isFinite(seCdParsed)) { + if (mode === "edit" && !Number.isFinite(cyclSeNoParsed)) { alert("구분 값이 올바르지 않습니다."); return; } @@ -140,13 +140,13 @@ export function StatisticsInputPeriodDialog({ const userInfo = await getUserInfo(); const param: StatsInputPeriodSaveRequest = { statsYr: yr, - seType, - inptBgngYmd: bgng, - inptEndYmd: end, - rgtrId: userInfo.userUnqId, + seTypeCd, + bgngYmd: bgng, + endYmd: end, + rgtrUuid: userInfo.userUnqId, }; if (!isCreate) { - param.seCd = seCdParsed; + param.cyclSeNo = cyclSeNoParsed; if ( initial?.extSchdlId != null && Number.isFinite(initial.extSchdlId) @@ -173,8 +173,8 @@ export function StatisticsInputPeriodDialog({ if (mode === "create" || !initial) return; if (!(await confirm("삭제하시겠습니까?"))) return; - const bgng = formatDateToYmd(initial.inptBgngYmd); - const end = formatDateToYmd(initial.inptEndYmd); + const bgng = formatDateToYmd(initial.bgngYmd); + const end = formatDateToYmd(initial.endYmd); if (!bgng || !end) { alert("삭제할 기간 정보가 없습니다."); return; @@ -184,19 +184,19 @@ export function StatisticsInputPeriodDialog({ alert("연도가 없습니다."); return; } - const seCd = - Number.isFinite(initial.seCd) && initial.seCd >= 0 ? initial.seCd : 0; + const cyclSeNo = + Number.isFinite(initial.cyclSeNo) && initial.cyclSeNo >= 0 ? initial.cyclSeNo : 0; try { setIsSubmitting(true); const userInfo = await getUserInfo(); const param: StatsInputPeriodDeleteRequest = { statsYr: yr, - seType: initial.seType, - seCd, - inptBgngYmd: bgng, - inptEndYmd: end, - rgtrId: userInfo.userUnqId, + seTypeCd: initial.seTypeCd, + cyclSeNo, + bgngYmd: bgng, + endYmd: end, + rgtrUuid: userInfo.userUnqId, }; if (initial.extSchdlId != null && Number.isFinite(initial.extSchdlId)) { param.extSchdlId = initial.extSchdlId; @@ -253,8 +253,8 @@ export function StatisticsInputPeriodDialog({