From 77e456ab1abd164d0256c12c96bcedbc07c07490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?sanguu516=28=EB=B0=95=EC=83=81=ED=98=84=29?=
 <sanguu516@naver.com>
Date: Thu, 19 Oct 2023 01:13:30 +0900
Subject: [PATCH] =?UTF-8?q?laanc=20api=20url=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?=EB=B0=8F=20rs=EB=B3=80=EA=B2=BD=20=EA=B3=A0=EB=8F=84=20?=
 =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EA=B4=80=EC=A0=9C=EA=B6=8C=20=EC=B1=84?=
 =?UTF-8?q?=ED=81=AC=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/laanc/LaancGrid.js       |  8 +--
 src/components/laanc/LaancSearch.js     |  2 +-
 src/modules/laanc/apis/laancApi.ts      |  2 +-
 src/modules/laanc/models/laancModels.ts | 71 ++++++++++++-------------
 src/views/laanc/LaancStep1.js           | 30 ++++++-----
 5 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/src/components/laanc/LaancGrid.js b/src/components/laanc/LaancGrid.js
index 0e66c386..c38d679f 100644
--- a/src/components/laanc/LaancGrid.js
+++ b/src/components/laanc/LaancGrid.js
@@ -96,7 +96,7 @@ function LaancGrid() {
       minWidth: '80px',
       sortable: true,
       cell: row => {
-        return row.elev;
+        return row.elev + 'm';
       }
     },
     {
@@ -152,7 +152,7 @@ function LaancGrid() {
               <div style={{ display: 'flex', alignItems: 'center' }}>
                 <h4>LAANC 승인 신청 목록</h4>
                 <span className='search-case'>
-                  검색결과 총 {laancSearchData?.numberOfElements}건
+                  검색결과 총 {laancSearchData?.length}건
                 </span>
               </div>
             </div>
@@ -168,10 +168,10 @@ function LaancGrid() {
                     </div>
                   </div>
                 ) : null}
-                {laancSearchData?.numberOfElements > 0 ? (
+                {laancSearchData?.length > 0 ? (
                   <GridDatabase
                     title={'비행이력'}
-                    data={laancSearchData?.content}
+                    data={laancSearchData}
                     //   count={laancSearchData?.size}
                     columns={columns}
                     // handlerPageChange={props.handlerPageChange}
diff --git a/src/components/laanc/LaancSearch.js b/src/components/laanc/LaancSearch.js
index f5f5d8f1..a7f85710 100644
--- a/src/components/laanc/LaancSearch.js
+++ b/src/components/laanc/LaancSearch.js
@@ -11,7 +11,7 @@ function LaancSearch() {
 
   const [date, setDate] = useState({
     schFltStDate: moment().subtract(0, 'day').format('YYYY-MM-DD'),
-    schFltEndDate: moment().subtract(-14, 'day').format('YYYY-MM-DD')
+    schFltEndDate: moment().subtract(-7, 'day').format('YYYY-MM-DD')
   });
 
   useEffect(() => {
diff --git a/src/modules/laanc/apis/laancApi.ts b/src/modules/laanc/apis/laancApi.ts
index 1e55a655..b1ce6eb2 100644
--- a/src/modules/laanc/apis/laancApi.ts
+++ b/src/modules/laanc/apis/laancApi.ts
@@ -27,7 +27,7 @@ export const laancApi = {
   },
   // 승인 목록 검색
   getAprvList: async (data: LaancAprvRq) => {
-    const res = await axios.get(`api/bas/laanc/aprv/list`, {
+    const res = await axios.get(`api/bas/laanc/aprv/list2`, {
       params: data
     });
     return res.data;
diff --git a/src/modules/laanc/models/laancModels.ts b/src/modules/laanc/models/laancModels.ts
index 6db6cde4..99a2c22d 100644
--- a/src/modules/laanc/models/laancModels.ts
+++ b/src/modules/laanc/models/laancModels.ts
@@ -623,41 +623,38 @@ export interface LaancAprvRq {
 
 // laanc 승인 요청 rs
 export interface LaancAprvData {
-  content: [
-    {
-      planSno: number;
-      groupId: string;
-      cstmrSno: number;
-      memberName: string;
-      email: string;
-      hpno: string;
-      clncd: string;
-      schFltStDt: string;
-      schFltEndDt: string;
-      fltPurpose: string;
-      aprvlYn: string;
-      createUserId: string;
-      createDt: string;
-      updateUserId: string;
-      updateDt: string;
-      serviceType: string;
-    }
-  ];
-  areaList: [
-    {
-      planAreaSno: number;
-      planSno: number;
-      areaType: string;
-      fltAreaAddr: string;
-      bufferZone: number;
-      fltElev: string;
-      createUserId: string;
-      createDt: string;
-      updateUserId: string;
-      updateDt: string;
-      docState: string;
-    }
-  ];
-  totalElements: number;
-  totalPages: number;
+  count: number;
+  data: {
+    planSno: number;
+    groupId: string;
+    cstmrSno: number;
+    memberName: string;
+    email: string;
+    hpno: string;
+    clncd: string;
+    schFltStDt: string;
+    schFltEndDt: string;
+    fltPurpose: string;
+    aprvlYn: string;
+    createUserId: string;
+    createDt: string;
+    updateUserId: string;
+    updateDt: string;
+    serviceType: string;
+    areaList: [
+      {
+        planAreaSno: number;
+        planSno: number;
+        areaType: string;
+        fltAreaAddr: string;
+        bufferZone: number;
+        fltElev: string;
+        createUserId: string;
+        createDt: string;
+        updateUserId: string;
+        updateDt: string;
+        docState: string;
+      }
+    ];
+  };
 }
diff --git a/src/views/laanc/LaancStep1.js b/src/views/laanc/LaancStep1.js
index dd2eeb95..6ce74b4d 100644
--- a/src/views/laanc/LaancStep1.js
+++ b/src/views/laanc/LaancStep1.js
@@ -168,22 +168,26 @@ export default function LaancStep1({
   const handleBlur = (value, type) => {
     switch (type) {
       case 'fltElev':
+        // if (
+        //   &&
+        //   data.areaList[0].coordList[0].lat != 0
+        // ) {
+        //   setIsErrorModal({
+        //     isOpen: true,
+        //     title: '고도 알림',
+        //     desc: (
+        //       <>
+        //         관제권 및 비행금지 공역을 제외한 지역에서는 주간에 150m미만의
+        //         <br />
+        //         고도에서는 비행승인없이 비행가능합니다.
+        //       </>
+        //     )
+        //   });
+        // }
         if (
-          parseInt(value.replace('/^0+/', 'm', ''), 10) <= 150 &&
+          parseInt(value.replace('/^0+/', 'm', ''), 10) > 150 &&
           data.areaList[0].coordList[0].lat != 0
         ) {
-          setIsErrorModal({
-            isOpen: true,
-            title: '고도 알림',
-            desc: (
-              <>
-                관제권 및 비행금지 공역을 제외한 지역에서는 주간에 150m미만의
-                <br />
-                고도에서는 비행승인없이 비행가능합니다.
-              </>
-            )
-          });
-        } else if (data.areaList[0].coordList[0].lat != 0) {
           handleChange({
             type: 'area',
             name: 'fltElev',