Merge remote-tracking branch 'origin/iipbs/st/dev'

apps/st/src/components/statistics/input/ExcretaTreatmentFacilityInp.tsx

@@ -784,7 +784,6 @@ const ExcretaTreatmentFacilityInp = () => {
                         lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn,
                         lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm,
                         lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm,
-                        ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}),
                         noApplicable,
                         submitList,
                         deleteList: deleteListForSubmit,

apps/st/src/components/statistics/input/PrivateSewageFacilityInp.tsx

@@ -797,7 +797,6 @@ const PrivateSewageFacilityInp = () => {
 
         const activeTabStatus = tabStatusInfoMap.get(tabKey) ?? null;
         const statsCdForTab = tabStatsCdMap.get(tabKey) ?? tabKey;
-        const adminOpt = isAdminInfo ? { superAdmin: "superAdmin" as const } : {};
 
         const submitInfoBase = {
             statsYr: lastSearchedValues.year ?? "",
@@ -842,7 +841,6 @@ const PrivateSewageFacilityInp = () => {
                     ...submitInfoBase,
                     userUuid: userInfo.userUnqId,
                     submitList: buildSewageTreatFactStatusSaveList(currentData),
-                    ...adminOpt,
                 };
                 response =
                     await statisticsInputPrivateSewageFacilityApi.submitSewageTreatFactStatus(
@@ -853,7 +851,6 @@ const PrivateSewageFacilityInp = () => {
                     ...submitInfoBase,
                     userUuid: userInfo.userUnqId,
                     submitList: buildSepticTankStatusSaveList(currentData),
-                    ...adminOpt,
                 };
                 response =
                     await statisticsInputPrivateSewageFacilityApi.submitSepticTankStatus(param);
@@ -862,7 +859,6 @@ const PrivateSewageFacilityInp = () => {
                     ...submitInfoBase,
                     userUuid: userInfo.userUnqId,
                     submitList: buildPrivateSewageDesigStatusSaveList(currentData),
-                    ...adminOpt,
                 };
                 response =
                     await statisticsInputPrivateSewageFacilityApi.submitPrivateSewageDesigStatus(

apps/st/src/components/statistics/input/PumpingStationInp.tsx

@@ -768,7 +768,6 @@ const PumpingStationInp = () => {
                 lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn,
                 lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm,
                 lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm,
-                ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}),
                 noApplicable,
                 submitList,
                 deleteList,

apps/st/src/components/statistics/input/SewageExcretaRelatedInp.tsx

@@ -1410,7 +1410,6 @@ const SewageExcretaRelatedInp = () => {
             lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm,
             lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm,
             ...(isPublicInstitutionTab ? { noApplicable } : {}),
-            ...(isAdminInfo ? { superAdmin: "superAdmin" as const } : {}),
         };
 
         const verificationQuery = {

apps/st/src/components/statistics/input/SewageExcretaSlurgeInp.tsx

@@ -1357,11 +1357,6 @@ const SewageExcretaSlurgeInp = () => {
                 : rowsForSubmit.map((row) =>
                       buildExcretaSlurgeProcessingStatusSaveItem(row, list),
                   );
-        const slurgeDeleteList = isSlurgeFacTab
-            ? (deleteListByTab.get(tabKey) ?? [])
-                  .filter((row) => isPersistedArticleRowForTab(tabKey, row))
-                  .map((row) => buildSlurgeProcessingFacStatusSaveItem(row, list))
-            : [];
         const sewageSlurgeFacDeleteList = isSewageSlurgeFacTab
             ? (deleteListByTab.get(tabKey) ?? [])
                   .filter((row) => isPersistedArticleRowForTab(tabKey, row))
@@ -1432,7 +1427,6 @@ const SewageExcretaSlurgeInp = () => {
             lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn,
             lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm,
             lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm,
-            ...(isAdminInfo ? { superAdmin: "superAdmin" as const } : {}),
             noApplicable,
         };
 
@@ -1445,7 +1439,6 @@ const SewageExcretaSlurgeInp = () => {
                       ...submitRequestBase,
                       userUuid: userInfo.userUnqId,
                       submitList: slurgeSubmitList,
-                      deleteList: slurgeDeleteList,
                   })
                 : isDigestorTab
                   ? await statisticsInputSewageExcretaSlurgeApi.submitDigestorOperatingStatus({
@@ -1655,9 +1648,6 @@ const SewageExcretaSlurgeInp = () => {
                         : rowsForSave.map((row) =>
                               buildSlurgeProcessingFacStatusSaveItem(row, list),
                           );
-                    const deleteList = (deleteListByTab.get(tabKey) ?? [])
-                        .filter((row) => isPersistedArticleRowForTab(tabKey, row))
-                        .map((row) => buildSlurgeProcessingFacStatusSaveItem(row, list));
 
                     if (!noApplicable && saveList.length === 0 && buildSubmitOkForToolbar(searchContextByTab.get(tabKey) ?? lastSearchedValues)) {
                         alert("해당사항 없음을 체크해주세요.");
@@ -1670,7 +1660,6 @@ const SewageExcretaSlurgeInp = () => {
                                 ...baseSaveRequest,
                                 ...userFields,
                                 saveList,
-                                deleteList,
                             },
                         );
                 } else if (tabKey === DigestorOperatingStatusInpColumn.tabKey) {

apps/st/src/components/statistics/input/SewagePipeInp.tsx

@@ -350,7 +350,6 @@ function buildRegionalFactSubmitListFromGrid(
     };
     return currentData.map((d) => ({
         admdstCd: nullableTrimmedString(d.admdstCd),
-        sggNm: nullableTrimmedString(d.sggNm),
         admdstNm: nullableTrimmedString(d.admdstNm),
         goalYr: nullableTrimmedString(d.goalYr),
         wholPplMtncPlanPrlg: formatNumber(d.wholPplMtncPlanPrlg, "wholPplMtncPlanPrlg"),
@@ -1264,7 +1263,6 @@ const SewagePipeInp = () => {
                     };
                     const submitList = currentData.map((d) => ({
                         admdstCd: nullableTrimmedString(d.admdstCd),
-                        sggNm: nullableTrimmedString(d.sggNm),
                         admdstNm: nullableTrimmedString(d.admdstNm),
                         fcltSn: nullableTrimmedString(d.fcltSn),
                         swtrmtFcltCd: nullableTrimmedString(d.swtrmtFcltCd),
@@ -1637,7 +1635,6 @@ const SewagePipeInp = () => {
 
                     const saveList = currentData.map((d) => ({
                         admdstCd: nullableTrimmedString(d.admdstCd),
-                        sggNm: nullableTrimmedString(d.sggNm),
                         admdstNm: nullableTrimmedString(d.admdstNm),
                         goalYr: nullableTrimmedString(d.goalYr),
                         wholPplMtncPlanPrlg: formatNumber(d.wholPplMtncPlanPrlg, "wholPplMtncPlanPrlg"),
@@ -1728,7 +1725,6 @@ const SewagePipeInp = () => {
 
                     const saveList = currentData.map((d) => ({
                         admdstCd: nullableTrimmedString(d.admdstCd),
-                        sggNm: nullableTrimmedString(d.sggNm),
                         admdstNm: nullableTrimmedString(d.admdstNm),
                         fcltSn: nullableTrimmedString(d.fcltSn),
                         swtrmtFcltCd: nullableTrimmedString(d.swtrmtFcltCd),

apps/st/src/components/statistics/input/SewagePipeMaintainInp.tsx

@@ -218,7 +218,6 @@ function buildRepairRowList(
 
     return currentData.map((d) => ({
         admdstCd: nullableTrimmedString(d.admdstCd),
-        sggNm: nullableTrimmedString(d.sggNm),
         admdstNm: nullableTrimmedString(d.admdstNm),
         dfrpWholPrlg: formatNumber(d.dfrpWholPrlg, "dfrpWholPrlg"),
         cbsysDfrpPrlg: formatNumber(d.cbsysDfrpPrlg, "cbsysDfrpPrlg"),
@@ -247,7 +246,6 @@ function buildDredgingRowList(
 
     return currentData.map((d) => ({
         admdstCd: nullableTrimmedString(d.admdstCd),
-        sggNm: nullableTrimmedString(d.sggNm),
         admdstNm: nullableTrimmedString(d.admdstNm),
         wholFcltPrlg: formatNumber(d.wholFcltPrlg, "wholFcltPrlg"),
         wholSwagePpl: formatNumber(d.wholSwagePpl, "wholSwagePpl"),

apps/st/src/components/statistics/input/SewerageFinanceInp.tsx

@@ -215,7 +215,6 @@ function buildSewerageFinanceSettleSaveList(
 
     return currentData.map((d) => ({
         admdstCd: nullableTrimmedString(d.admdstCd),
-        sggNm: nullableTrimmedString(d.sggNm),
         admdstNm: nullableTrimmedString(d.admdstNm),
         soaGovSprtAmt: formatNumber(d.soaGovSprtAmt, "soaGovSprtAmt"),
         mctpvLcexpAmt: formatNumber(d.mctpvLcexpAmt, "mctpvLcexpAmt"),
@@ -257,7 +256,6 @@ function buildSewerageChargeSaveList(
 
     return currentData.map((d) => ({
         admdstCd: nullableTrimmedString(d.admdstCd),
-        sggNm: nullableTrimmedString(d.sggNm),
         admdstNm: nullableTrimmedString(d.admdstNm),
         anlLevyQnt: formatNumber(d.anlLevyQnt, "anlLevyQnt"),
         sewerLevyAmt: formatNumber(d.sewerLevyAmt, "sewerLevyAmt"),
@@ -276,7 +274,6 @@ function buildSewerageUsageFeeSaveList(
 
     return currentData.map((d) => ({
         admdstCd: nullableTrimmedString(d.admdstCd),
-        sggNm: nullableTrimmedString(d.sggNm),
         admdstNm: nullableTrimmedString(d.admdstNm),
         hshusLevyAmt: formatNumber(d.hshusLevyAmt, "hshusLevyAmt"),
         hshusLevyQnt: formatNumber(d.hshusLevyQnt, "hshusLevyQnt"),
@@ -312,7 +309,6 @@ function buildCauserBurdenSaveList(
 
     return currentData.map((d) => ({
         admdstCd: nullableTrimmedString(d.admdstCd),
-        sggNm: nullableTrimmedString(d.sggNm),
         admdstNm: nullableTrimmedString(d.admdstNm),
         brdnAmtLevyNocs: formatNumber(d.brdnAmtLevyNocs, "brdnAmtLevyNocs"),
         brdnAmtLevyAmt: formatNumber(d.brdnAmtLevyAmt, "brdnAmtLevyAmt"),
@@ -849,7 +845,6 @@ const SewerageFinanceInp = () => {
 
         const activeTabStatus = tabStatusInfoMap.get(tabKey) ?? null;
         const statsCdForTab = tabStatsCdMap.get(tabKey) ?? tabKey;
-        const adminOpt = isAdminInfo ? { superAdmin: "superAdmin" as const } : {};
 
         const submitInfoBase = {
             statsYr: lastSearchedValues.year ?? "",
@@ -894,7 +889,6 @@ const SewerageFinanceInp = () => {
                     ...submitInfoBase,
                     userUuid: userInfo.userUnqId,
                     submitList: buildSewerageFinanceSettleSaveList(currentData),
-                    ...adminOpt,
                 };
                 response =
                     await statisticsInputSewerageFinanceApi.submitSewerageFinanceSettle(
@@ -905,7 +899,6 @@ const SewerageFinanceInp = () => {
                     ...submitInfoBase,
                     userUuid: userInfo.userUnqId,
                     submitList: buildSewerageChargeSaveList(currentData),
-                    ...adminOpt,
                 };
                 response = await statisticsInputSewerageFinanceApi.submitSewerageCharge(param);
             } else if (isUsageFeeTab) {
@@ -913,7 +906,6 @@ const SewerageFinanceInp = () => {
                     ...submitInfoBase,
                     userUuid: userInfo.userUnqId,
                     submitList: buildSewerageUsageFeeSaveList(currentData),
-                    ...adminOpt,
                 };
                 response =
                     await statisticsInputSewerageFinanceApi.submitSewerageUsageFee(param);
@@ -922,7 +914,6 @@ const SewerageFinanceInp = () => {
                     ...submitInfoBase,
                     userUuid: userInfo.userUnqId,
                     submitList: buildCauserBurdenSaveList(currentData),
-                    ...adminOpt,
                 };
                 response = await statisticsInputSewerageFinanceApi.submitCauserBurden(param);
             }

apps/st/src/components/statistics/input/SeweragePenetrationRateInp.tsx

@@ -399,10 +399,6 @@ const SeweragePenetrationRateInp = () => {
             statsCd: statsCd,
         };
 
-        if (isAdminInfo) {
-            params.superAdmin = 'superAdmin';
-        }
-
         try {
             setIsLoading(true);
 
@@ -498,7 +494,6 @@ const SeweragePenetrationRateInp = () => {
             };
 
             const convertedData: SewerageSupplyRateSaveItem[] = currentData.map((d) => ({
-                sggNm: nullableTrimmedString(d.sggNm),
                 admdstCd: nullableTrimmedString(d.admdstCd),
                 admdstNm: nullableTrimmedString(d.admdstNm),
                 statsTrbtrNm: nullableTrimmedString(d.statsTrbtrNm),
@@ -677,8 +672,6 @@ const SeweragePenetrationRateInp = () => {
                 };
 
                 const convertedData: SewerageSupplyRateSaveItem[] = currentData.map((d) => ({
-                    // 행정구역
-                    sggNm: nullableTrimmedString(d.sggNm),                           // 시군구
                     admdstCd: nullableTrimmedString(d.admdstCd),                     // 행정코드
                     admdstNm: nullableTrimmedString(d.admdstNm),                     // 행정구역명
                     statsTrbtrNm: nullableTrimmedString(d.statsTrbtrNm),               // 지류

apps/st/src/components/statistics/input/SewerageServiceLevelInp.tsx

@@ -808,13 +808,11 @@ const SewerageServiceLevelInp = () => {
                 ? await statisticsInputSewerageServiceLevelApi.submitComplaintList({
                       ...submitInfoBase,
                       userUuid: userInfo.userUnqId,
-                      ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}),
                       submitList: complaintSubmitList,
                   })
                 : await statisticsInputSewerageServiceLevelApi.submitResidentFriendlyFactList({
                       ...submitInfoBase,
                       userUuid: userInfo.userUnqId,
-                      ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}),
                       noApplicable,
                       submitList: residentSubmitList,
                   });

apps/st/src/components/statistics/input/WaterReuseInp.tsx

@@ -1153,7 +1153,6 @@ const WaterReuseInp = () => {
             lclgvIdfrTelnoCn: submitInfo.lclgvIdfrTelnoCn,
             lclgvIdfrDeptNm: submitInfo.lclgvIdfrDeptNm,
             lclgvIdfrJbgdNm: submitInfo.lclgvIdfrJbgdNm,
-            ...(isAdminInfo ? { superAdmin: "superAdmin" } : {}),
         };
 
         let articleSggOptions: Sgg[] | null = null;

apps/st/src/entities/statistics/model/input/statistics-input-sewage-excreta-slurge-interface.ts

@@ -117,7 +117,7 @@ export type SlurgeProcessingFacStatusApiResponse =
     };
 
 /**
- * ST00110001 저장 — `saveList` / `deleteList` 항목.
+ * ST00110001 저장 — `saveList` 항목.
  * `sggNm`·계산필드·검증결과는 저장 요청에서 제외.
  */
 export type SlurgeProcessingFacStatusSaveItem = Omit<
@@ -167,7 +167,6 @@ export interface SlurgeProcessingFacStatusSaveRequest {
     superAdmin?: string;
     noApplicable?: boolean;
     saveList: SlurgeProcessingFacStatusSaveItem[];
-    deleteList: SlurgeProcessingFacStatusSaveItem[];
 }
 
 export type SlurgeProcessingFacStatusSaveResponse = ApiResponse<unknown> & {
@@ -194,7 +193,6 @@ export interface SlurgeProcessingFacStatusSubmitRequest {
     superAdmin?: string;
     noApplicable?: boolean;
     submitList: SlurgeProcessingFacStatusSubmitItem[];
-    deleteList: SlurgeProcessingFacStatusSubmitItem[];
 }
 
 export interface SlurgeProcessingFacStatusSubmitResponse {

apps/st/src/entities/statistics/model/input/statistics-input-sewage-pipe-maintain-interface.ts

@@ -98,7 +98,6 @@ export type SewagePipeMaintainDredgingResponse = ApiResponse<SewagePipeMaintainD
 /** ST00030001 하수관로 유지관리 > 개보수 저장·제출 API 행 */
 export interface SewagePipeMaintainRepairSaveItem {
     admdstCd: string | null;
-    sggNm: string | null;
     admdstNm: string | null;
     dfrpWholPrlg: number;
     cbsysDfrpPrlg: number;
@@ -167,7 +166,6 @@ export interface SewagePipeMaintainRepairSubmitResponse {
 /** ST00030002 하수관로 유지관리 > 관로준설 저장·제출 API 행 */
 export interface SewagePipeMaintainDredgingSaveItem {
     admdstCd: string | null;
-    sggNm: string | null;
     admdstNm: string | null;
     wholFcltPrlg: number;
     wholSwagePpl: number;

apps/st/src/entities/statistics/model/input/statistics-input-sewerage-finance-interface.ts

@@ -92,7 +92,6 @@ export interface SewerageFinanceSettleRequestParams {
  */
 export interface SewerageFinanceSettleSaveItem {
     admdstCd: string | null;
-    sggNm: string | null;
     admdstNm: string | null;
     soaGovSprtAmt: number;
     mctpvLcexpAmt: number;
@@ -255,7 +254,6 @@ export interface SewerageChargeRequestParams {
  */
 export interface SewerageChargeSaveItem {
     admdstCd: string | null;
-    sggNm: string | null;
     admdstNm: string | null;
     anlLevyQnt: number;
     sewerLevyAmt: number;
@@ -362,7 +360,6 @@ export interface SewerageUsageFeeRequestParams {
  */
 export interface SewerageUsageFeeSaveItem {
     admdstCd: string | null;
-    sggNm: string | null;
     admdstNm: string | null;
     hshusLevyAmt: number;
     hshusLevyQnt: number;
@@ -472,7 +469,6 @@ export interface CauserBurdenRequestParams {
  */
 export interface CauserBurdenSaveItem {
     admdstCd: string | null;
-    sggNm: string | null;
     admdstNm: string | null;
     brdnAmtLevyNocs: number;
     brdnAmtLevyAmt: number;

apps/st/src/entities/statistics/model/input/statistics-sewage-pipe-input-interface.ts

@@ -99,7 +99,6 @@ export type SeweragePipeInputRegionalFactStatusSaveItem = Omit<
     "verificationResult" | "admdstCd" | "sggNm" | "admdstNm" | "goalYr"
 > & {
     admdstCd: string | null;
-    sggNm: string | null;
     admdstNm: string | null;
     goalYr: string | null;
 };
@@ -118,7 +117,6 @@ export type SeweragePipeInputFactInstallStatusSaveItem = Omit<
     | "rmrk"
 > & {
     admdstCd: string | null;
-    sggNm: string | null;
     admdstNm: string | null;
     fcltSn: string | null;
     swtrmtFcltCd: string | null;

apps/st/src/entities/statistics/model/input/statistics-sewage-supply-rate-input-interface.ts

@@ -86,7 +86,6 @@ export interface SewerageSupplyRateRequestParams {
 
 /** 하수도 보급률 저장 API 요청 body (한 행) */
 export interface SewerageSupplyRateSaveItem {
-    sggNm: string | null;
     admdstCd: string | null;
     admdstNm: string | null;
     statsTrbtrNm: string | null;