From 029a0d530f841ed993c691bbad009186e3a19d63 Mon Sep 17 00:00:00 2001
From: sanguu <sanguu516@naver.com>
Date: Mon, 19 Sep 2022 13:26:00 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=20?=
 =?UTF-8?q?=ED=98=84=ED=99=A9(=EC=B0=BD=20=EA=B9=A8=EC=A7=90&&=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EA=B0=92=20=EB=B3=80=EA=B2=BD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../history/AnalysisHistoryContainer.js       | 41 +++++++++++--------
 .../flight/aprv/FlightPlanAprvContainer.js    |  1 +
 .../history/apis/annalysisHistoryApi.ts       |  1 +
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js
index 6f7587c..3f3e52c 100644
--- a/src/containers/analysis/history/AnalysisHistoryContainer.js
+++ b/src/containers/analysis/history/AnalysisHistoryContainer.js
@@ -20,11 +20,12 @@ export const AnalysisHistoryContainer = props => {
     state => state.analysisHistoryState
   );
   const initSearchData = {
-    schFltStDt: moment().set({ 'date': 1, 'h': 0, 'm': 0, 's': 0 }).format('YYYY-MM-DD HH:mm:ss'),
-    schFltEndDt: moment().set({ 'h': 23, 'm': 59, 's': 59 }).format('YYYY-MM-DD HH:mm:ss'),
-    aprvlYn: 'N',
+   stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'),
+   endDate: moment().subtract(0, 'day').format('YYYY-MM-DD'),
+  // stDate: moment().set({ 'date': 1, 'h': 0, 'm': 0, 's': 0 }).format('YYYY-MM-DD HH:mm:ss'),
+  // endDate: moment().set({ 'h': 23, 'm': 59, 's': 59 }).format('YYYY-MM-DD HH:mm:ss'),
     groupId: '',
-    cstmrSno: 0,
+    
   };
 
   const history = useHistory();
@@ -37,11 +38,11 @@ export const AnalysisHistoryContainer = props => {
   const handleGroupSelect = ({ groupId, groupNm, groupAuthCd }) => {
     // 권한 상관 없이 모두 조회 가능
     const param = searchData;
-    param.cstmrSno = user.cstmrSno;
+   // param.cstmrSno = user.cstmrSno;
     param.groupId = groupId;
 
-    dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT({ cstmrSno: user.cstmrSno, groupId: groupId, groupNm: groupNm }));
-
+    dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT({groupId: groupId }));
+    
     // groupId sessionStorage에 보관 (1 브라우저 1 tab에만 유효)
     sessionStorage.setItem('groupId', groupId);
     sessionStorage.setItem('cstmrSno', user.cstmrSno);
@@ -49,12 +50,12 @@ export const AnalysisHistoryContainer = props => {
     setSearchData(prevState => {
       return {
         ...prevState,
-        cstmrSno: user.cstmrSno,
+    //    cstmrSno: user.cstmrSno,
         groupId: groupId
       }
     });
-
-    dispatch(FlightAction.FLIGHT_PLAN_LIST.request(param));
+    
+    dispatch(Actions.list.request({searchParams:param}));
   }
 
   const handlerGroupCancel = () => {
@@ -62,16 +63,20 @@ export const AnalysisHistoryContainer = props => {
   }
   const handleSearch = (data) => {
     dispatch(FlightAction.FLIGHT_APRV_LIST.request(data));
+    
   }
   const handleChangeSelected = ({ selectedRows }) => {
     setSelPlanSnoList(selectedRows.map(item => item.planSno))
   }
 
 
-    // 최초 비행계획서 목록 조회
-    useEffect(() => {
-      handleSearch(searchData);
-  }, [])
+
+
+  useEffect(() => {
+    if (aprvProc && aprvProc.result > 0) {
+        handleSearch(searchData);
+    }
+}, [aprvProc])
 
   useEffect(() => {
     if (user?.cstmrSno) {
@@ -211,8 +216,7 @@ export const AnalysisHistoryContainer = props => {
         search1: searchParams.search1
       });
     }
-
-    handlerSearch();
+   // handlerSearch();
   }, []);
 
   const onKeyPress = e => {
@@ -224,7 +228,8 @@ export const AnalysisHistoryContainer = props => {
   useEffect(() => { }, [params]);
 
   const handlerSearch = () => {
-    dispatch(Actions.list.request({ searchParams: params }));
+
+   dispatch(Actions.list.request({ searchParams: params }));
   };
 
   const handlerInput = (type, val) => {
@@ -244,6 +249,7 @@ export const AnalysisHistoryContainer = props => {
   return (
 
     <CustomMainLayout title={titleName}>
+                  <div className='pal-card-box'>
       <Row>
         <Col sm='4'>
           <FlightPlanGroupGrid
@@ -294,6 +300,7 @@ export const AnalysisHistoryContainer = props => {
 
         </Col>
       </Row>
+      </div>
     </CustomMainLayout>
   );
 };
diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
index f37f4da..3fed6b5 100644
--- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
+++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
@@ -90,6 +90,7 @@ const FlightPlanAprvContainer = () => {
 
     // 최초 비행계획서 목록 조회
     useEffect(() => {
+      
         handleSearch(searchData);
     }, [])
     useEffect(() => {
diff --git a/src/modules/analysis/history/apis/annalysisHistoryApi.ts b/src/modules/analysis/history/apis/annalysisHistoryApi.ts
index a783fb4..197e989 100644
--- a/src/modules/analysis/history/apis/annalysisHistoryApi.ts
+++ b/src/modules/analysis/history/apis/annalysisHistoryApi.ts
@@ -6,6 +6,7 @@ import { AnalysisHistoryState } from '../models/analysisHitoryModel';
 
 export const analysisHistory = {
   list: async (data: string) => {
+    
     const queryString = qs.stringify(data, {
       addQueryPrefix: true,
       arrayFormat: 'repeat'