From bb232c4d7e36e52b67d263d6d7cf0f1b4dfbcd9e Mon Sep 17 00:00:00 2001 From: sanguu516 Date: Tue, 27 Aug 2024 14:19:08 +0900 Subject: [PATCH] =?UTF-8?q?feat/=EA=B8=B0=EC=B2=B4=20=EC=A4=91=EB=9F=89=20?= =?UTF-8?q?=ED=91=9C=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/redux/features/laanc/laancState.ts | 7 +++++++ src/redux/features/laanc/laancThunk.ts | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/redux/features/laanc/laancState.ts b/src/redux/features/laanc/laancState.ts index dfedc67f..d9de1019 100644 --- a/src/redux/features/laanc/laancState.ts +++ b/src/redux/features/laanc/laancState.ts @@ -663,6 +663,13 @@ export interface ILaancAprvListRs { limitZoneCd: string; reqRadius: number; allowRadius: number; + droneList: { + benefit: string; + insrncJoinYn: string; + planDroneSno: number; + weightCd: string; + weightNm: string; + }[]; areaList: { planAreaSno: number; planSno: number; diff --git a/src/redux/features/laanc/laancThunk.ts b/src/redux/features/laanc/laancThunk.ts index 9b878356..92f3b26c 100644 --- a/src/redux/features/laanc/laancThunk.ts +++ b/src/redux/features/laanc/laancThunk.ts @@ -284,9 +284,12 @@ export const getLaancAprvList = createAsyncThunk( ...item, ...item.areaList[0], cReviewedType: item.reviewedType, - areaList: item.areaList.map((area, innerIndex) => { + areaList: item.areaList.map((area, xIndex) => { return { ...area, + ...(item.droneList[xIndex]?.weightNm && { + weightNm: item.droneList[xIndex].weightNm + }), purpose: item.purpose, cReviewedType: area.reviewedType }; @@ -297,11 +300,15 @@ export const getLaancAprvList = createAsyncThunk( ...item, planAreaSno: item.areaList[0].planAreaSno, cReviewedType: item.reviewedType, - areaList: item.areaList.map((area, innerIndex) => { + areaList: item.areaList.map((area, zIndex) => { + console.log('>>', item?.droneList[zIndex]?.weightNm); return { ...area, applyNm: item.applyNm, purpose: item.purpose, + ...(item.droneList[zIndex]?.weightNm && { + weightNm: item.droneList[zIndex].weightNm + }), cReviewedType: area.reviewedType, fltElevMax: !area.fltElevMax && area.approvalCd === 'U'