laanc 1스텝 api 연결(작업중)

src/containers/laanc/LaancPlanContainer.js

@@ -9,27 +9,15 @@ import { ErrorModal } from '../../components/modal/ErrorModal';
 import {
   initFlight,
   initFlightBas
-} from '../../modules/basis/flight/models/basisFlightModel';
+} from '../../modules/laanc/models/laancModels';
-import {
+import { Modal } from 'reactstrap';
-  Row,
-  Col,
-  Button,
-  Modal,
-  ModalHeader,
-  ModalBody,
-  ModalFooter,
-  Alert,
-  FormGroup,
-  Label,
-  Input
-} from 'reactstrap';
 import {
   AREA_DETAIL_INIT,
   FLIGHT_PLAN_AREA_BUFFER_LIST
 } from '../../modules/basis/flight/actions/basisFlightAction';
 import { useDispatch, useSelector } from 'react-redux';
 import { drawTypeChangeAction } from '../../modules/control/map/actions/controlMapActions';
-
+import * as LaancAction from '../../modules/laanc/actions/laancActions';
 export default function LaancPlanContainer({
   currentParm,
   disabledAnimation,
@@ -37,7 +25,6 @@ export default function LaancPlanContainer({
 }) {
   const { areaCoordList } = useSelector(state => state.flightState);
 
-  const dispatch = useDispatch();
   const [step, setStep] = useState(1);
   const [detailData, setDetailData] = useState(initFlightBas.initDetail);
   const [centeredModal, setCenteredModal] = useState(false);
@@ -47,19 +34,16 @@ export default function LaancPlanContainer({
     title: '',
     desc: ''
   });
-  //날씨 임시 데이터
+  const { user } = useSelector(state => state.authState);
-  const [wheather, setWheather] = useState([
+  const dispatch = useDispatch();
-    {
-      coordList: [
-        {
-          lat: 37.40284040287055,
-          lon: 126.68639226254697
-        }
-      ]
-    }
-  ]);
 
+  console.log('user>>>', user);
   useEffect(() => {
+    setDetailData({
+      ...detailData,
+      cstmrSno: user.cstmrSno,
+      memberName: user.memberName
+    });
     return () => {
       dispatch(drawTypeChangeAction(''));
     };
@@ -214,10 +198,10 @@ export default function LaancPlanContainer({
       return false;
     } else if (
       !detailData.arcrftList[0].arcrftTypeCd &&
-      (detailData.commercial === '상업' ||
+      (detailData.commercial === 'COMMERCIAL' ||
-        detailData.arcrftList[0].arcrftWdth == '25kg초과' ||
+        detailData.arcrftList[0].arcrftWdth == '9' ||
-        detailData.arcrftList[0].arcrftWdth == '2kg초과~7kg이하' ||
+        detailData.arcrftList[0].arcrftWdth == '10' ||
-        detailData.arcrftList[0].arcrftWdth == '7kg초과~25kg이하')
+        detailData.arcrftList[0].arcrftWdth == '11')
     ) {
       setModal2({
         isOpen: true,
@@ -228,10 +212,10 @@ export default function LaancPlanContainer({
       return false;
     } else if (
       !detailData.arcrftList[0].groupNm &&
-      (detailData.commercial === '상업' ||
+      (detailData.commercial === 'COMMERCIAL' ||
-        detailData.arcrftList[0].arcrftWdth == '25kg초과' ||
+        detailData.arcrftList[0].arcrftWdth == '9' ||
-        detailData.arcrftList[0].arcrftWdth == '2kg초과~7kg이하' ||
+        detailData.arcrftList[0].arcrftWdth == '10' ||
-        detailData.arcrftList[0].arcrftWdth == '7kg초과~25kg이하')
+        detailData.arcrftList[0].arcrftWdth == '11')
     ) {
       setModal2({
         isOpen: true,
@@ -243,6 +227,7 @@ export default function LaancPlanContainer({
     } else {
       //api 호출 부분
 
+      dispatch(LaancAction.laancFlightApproval.request(detailData));
       setStep(2);
     }
   };

src/modules/laanc/actions/laancActions.ts

@@ -1,7 +1,11 @@
 import { AxiosError } from 'axios';
 import { create } from 'sortablejs';
 import { ActionType, createAction, createAsyncAction } from 'typesafe-actions';
-import { LaancFlightData, LaancApproval } from '../models/laancModels';
+import {
+  LaancFlightData,
+  LaancApproval,
+  FlightPlanData
+} from '../models/laancModels';
 
 // laanc 공문 pdf 다운로드
 const LAANC_PDF_REQUEST = 'laanc/pdf/REQUEST';
@@ -25,7 +29,7 @@ export const laancFlightApproval = createAsyncAction(
   LAANC_FLIGHT_APPROVAL_REQUEST,
   LAANC_FLIGHT_APPROVAL_SUCCESS,
   LAANC_FLIGHT_APPROVAL_FAILURE
-)<LaancApproval, LaancApproval, AxiosError>();
+)<FlightPlanData, LaancApproval, AxiosError>();
 
 const actions = {
   laancPdfAction,

src/modules/laanc/apis/laancApi.ts

@@ -1,13 +1,14 @@
 import axios from '../../utils/customAxiosUtil';
-import {} from '../models/laancModels';
+import {
+  LaancFlightData,
+  FlightPlanAreaData,
+  FlightPlanData
+} from '../models/laancModels';
 
 // laanc 승인
-// export const laancApprovalApi = {
+export const laancApi = {
-//     postApproval: async (rq:) => {
+  postApproval: async (data: FlightPlanData) => {
-//       const { data }: ResponseApprovalData = await axios.post(
+    const res = await axios.post(`api/bas/laanc/plan/valid`, data);
-//         `api/ctr/cntrl/history/list/${id}`
+    return res;
-//       );
+  }
-
+};
-//       return data;
-//     },
-// }

src/modules/laanc/models/laancModels.ts

@@ -2,6 +2,7 @@ import moment from 'moment';
 
 export interface laancState {
   laancApproval: LaancApproval | undefined;
+  detail: FlightPlanData | undefined;
 }
 
 // laanc계획서 초기값
@@ -216,6 +217,428 @@ export interface LaancApproval {
   flightAreaYn: string; // LAANC 기준 비행가능여부
 }
 
+export interface FlightPlanData {
+  planSno?: number;
+  groupId: string;
+  cstmrSno: number;
+  memberName: string;
+  email: string;
+  hpno: string;
+  clncd: string;
+  addr: string;
+  addrDtlCn: string;
+  zip: string;
+  schFltStDt: string;
+  schFltEndDt: string;
+  fltPurpose: string;
+  aprvlYn: string;
+  delYn: string;
+  createUserId: string;
+  createDt: string;
+  updateUserId: string;
+  updateDt: string;
+  areaList?: FlightPlanAreaDataList | undefined;
+  pilotList?: FlightPlanPilotDataList | undefined;
+  arcrftList?: FlightPlanArcrftDataList | undefined;
+  // docState: string
+}
+
+export interface FlightPlanAreaData {
+  planAreaSno?: number;
+  planSno: number;
+  areaType: string;
+  fltMethod: string;
+  bufferZone: number;
+  fltElev: string;
+  createUserId?: string;
+  createDt?: string;
+  updateUserId?: string;
+  updateDt?: string;
+  coordList?: FlightPlanAreaCoordDataList | undefined;
+  bufferCoordList?: FlightPlanAreaCoordDataList | undefined;
+  // docState: string,
+}
+
+export interface FlightPlanAreaDataList extends Array<FlightPlanAreaData> {}
+
+export interface FlightPlanAreaCoordData {
+  planAreaCoordSno?: number;
+  planAreaSno?: number;
+  lat: number;
+  lon: number;
+  createUserId?: string;
+  createDt?: string;
+  // docState: string
+}
+
+export interface FlightPlanAreaCoordDataList
+  extends Array<FlightPlanAreaCoordData> {}
+
+export interface FlightPlanPilotData {
+  planPilotSno?: number;
+  planSno?: number;
+  cstmrSno?: number;
+  groupNm: string;
+  memberName: string;
+  email: string;
+  hpno: string;
+  clncd: string;
+  addr: string;
+  addrDtlCn: string;
+  zip: string;
+  qlfcNo: string;
+  carrer: string;
+  createUserId: string;
+  createDt: string;
+  updateUserId: string;
+  updateDt: string;
+  // docState: string
+}
+
+export interface FlightPlanPilotDataList extends Array<FlightPlanPilotData> {}
+
+export interface FlightPlanArcrftData {
+  planArcrftSno: number;
+  planSno: number;
+  arcrftSno: number;
+  idntfNum: string;
+  groupNm: string;
+  prdctNum: string;
+  arcrftTypeCd: string;
+  arcrftModelNm: string;
+  prdctCmpnNm: string;
+  prdctDate: string;
+  arcrftLngth: number;
+  arcrftWdth: number;
+  arcrftHght: number;
+  arcrftWght: number;
+  wghtTypeCd: string;
+  imageUrl: string;
+  takeoffWght: number;
+  useYn: string;
+  cameraYn: string;
+  insrncYn: string;
+  ownerNm: string;
+  createUserId: string;
+  createDt: string;
+  updateUserId: string;
+  updateDt: string;
+  // docState: string
+}
+
+export interface FlightPlanArcrftDataList extends Array<FlightPlanArcrftData> {}
+
 export const laancControlData = {
-  laancApproval: undefined
+  laancApproval: undefined,
+  detail: {
+    planSno: 0,
+    groupId: '',
+    cstmrSno: 0,
+    memberName: '',
+    email: '',
+    hpno: '',
+    clncd: '+82',
+    addr: '',
+    addrDtlCn: '',
+    zip: '',
+    schFltStDt: moment()
+      .set({ h: 0, m: 0, s: 0 })
+      .format('YYYY-MM-DD HH:mm:ss'),
+    schFltEndDt: moment()
+      .set({ h: 0, m: 0, s: 0 })
+      .format('YYYY-MM-DD HH:mm:ss'),
+    fltPurpose: '',
+    aprvlYn: '',
+    delYn: '',
+    createUserId: '',
+    createDt: '',
+    updateUserId: '',
+    updateDt: '',
+    areaList: [
+      {
+        planAreaSno: 0,
+        planSno: 0,
+        areaType: '',
+        fltMethod: '',
+        bufferZone: 0,
+        fltElev: '',
+        createUserId: '',
+        createDt: '',
+        updateUserId: '',
+        updateDt: '',
+        coordList: [
+          {
+            planAreaCoordSno: 0,
+            planAreaSno: 0,
+            lat: 0,
+            lon: 0,
+            createUserId: '',
+            createDt: ''
+          }
+        ],
+        bufferCoordList: [
+          {
+            planAreaCoordSno: 0,
+            planAreaSno: 0,
+            lat: 0,
+            lon: 0,
+            createUserId: '',
+            createDt: ''
+          }
+        ]
+      }
+    ],
+
+    pilotList: [
+      {
+        planPilotSno: 0,
+        planSno: 0,
+        cstmrSno: 0,
+        groupNm: '',
+        memberName: '',
+        email: '',
+        hpno: '',
+        clncd: '+82',
+        addr: '',
+        addrDtlCn: '',
+        zip: '',
+        qlfcNo: '',
+        carrer: '',
+        createUserId: '',
+        createDt: '',
+        updateUserId: '',
+        updateDt: ''
+      }
+    ],
+    arcrftList: [
+      {
+        planArcrftSno: 0,
+        planSno: 0,
+        arcrftSno: 0,
+        idntfNum: '',
+        groupNm: '',
+        prdctNum: '',
+        arcrftTypeCd: '',
+        arcrftModelNm: '',
+        prdctCmpnNm: '',
+        prdctDate: '',
+        arcrftLngth: 0,
+        arcrftWdth: 0,
+        arcrftHght: 0,
+        arcrftWght: 0,
+        wghtTypeCd: '',
+        imageUrl: '',
+        takeoffWght: 0,
+        useYn: '',
+        cameraYn: '',
+        insrncYn: '',
+        ownerNm: '',
+        createUserId: '',
+        createDt: '',
+        updateUserId: '',
+        updateDt: ''
+      }
+    ]
+  }
+};
+export const initFlightBas = {
+  page: 1,
+  total: 0,
+  plan: {
+    planSno: 0,
+    groupId: '',
+    cstmrSno: 0,
+    memberName: '',
+    email: '',
+    hpno: '',
+    clncd: '+82',
+    addr: '',
+    addrDtlCn: '',
+    zip: '',
+    schFltStDt: moment().format('YYYY-MM-DD HH:mm:ss'),
+    schFltEndDt: moment().format('YYYY-MM-DD HH:mm:ss'),
+    fltPurpose: '',
+    aprvlYn: '',
+    delYn: '',
+    createUserId: '',
+    createDt: '',
+    updateUserId: '',
+    updateDt: '',
+    areaList: undefined,
+    pilotList: undefined,
+    arcrftList: undefined
+  },
+  pilot: {
+    planPilotSno: 0,
+    planSno: 0,
+    cstmrSno: 0,
+    groupNm: '',
+    memberName: '',
+    email: '',
+    hpno: '',
+    clncd: '+82',
+    addr: '',
+    addrDtlCn: '',
+    zip: '',
+    qlfcNo: '',
+    carrer: '',
+    createUserId: '',
+    createDt: '',
+    updateUserId: '',
+    updateDt: ''
+  },
+  arcrft: {
+    planArcrftSno: 0,
+    planSno: 0,
+    arcrftSno: 0,
+    idntfNum: '',
+    groupNm: '',
+    prdctNum: '',
+    arcrftTypeCd: '',
+    arcrftModelNm: '',
+    prdctCmpnNm: '',
+    prdctDate: '',
+    arcrftLngth: 0,
+    arcrftWdth: 0,
+    arcrftHght: 0,
+    arcrftWght: 0,
+    wghtTypeCd: '',
+    imageUrl: '',
+    takeoffWght: 0,
+    useYn: '',
+    cameraYn: '',
+    insrncYn: '',
+    ownerNm: '',
+    createUserId: '',
+    createDt: '',
+    updateUserId: '',
+    updateDt: ''
+  },
+  area: {
+    planAreaSno: 0,
+    planSno: 0,
+    areaType: '',
+    fltMethod: '',
+    bufferZone: 0,
+    fltElev: '',
+    createUserId: '',
+    createDt: '',
+    updateUserId: '',
+    updateDt: '',
+    coordList: undefined
+  },
+  coord: {
+    planAreaCoordSno: 0,
+    planAreaSno: 0,
+    lat: 0,
+    lon: 0,
+    createUserId: '',
+    createDt: ''
+  },
+  initDetail: {
+    planSno: 0,
+    groupId: '',
+    cstmrSno: 0,
+    memberName: '',
+    email: '',
+    commercial: '',
+    hpno: '',
+    clncd: '+82',
+    addr: '',
+    addrDtlCn: '',
+    zip: '',
+    schFltStDt: moment().add(5, 'minute').format('YYYY-MM-DD HH:mm:ss'),
+    schFltEndDt: moment().add(2, 'hours').format('YYYY-MM-DD HH:mm:ss'),
+    fltPurpose: '',
+    aprvlYn: '',
+    delYn: '',
+    createUserId: '',
+    createDt: '',
+    updateUserId: '',
+    updateDt: '',
+    areaList: [
+      {
+        planAreaSno: 0,
+        planSno: 0,
+        areaType: '',
+        fltMethod: '',
+        bufferZone: 0,
+        fltElev: '0',
+        createUserId: '',
+        createDt: '',
+        updateUserId: '',
+        updateDt: '',
+        coordList: [
+          {
+            planAreaCoordSno: 0,
+            planAreaSno: 0,
+            lat: 0,
+            lon: 0,
+            createUserId: '',
+            createDt: ''
+          }
+        ],
+        bufferCoordList: [
+          {
+            planAreaCoordSno: 0,
+            planAreaSno: 0,
+            lat: 0,
+            lon: 0,
+            createUserId: '',
+            createDt: ''
+          }
+        ]
+      }
+    ],
+    pilotList: [
+      {
+        planPilotSno: 0,
+        planSno: 0,
+        cstmrSno: 0,
+        groupNm: '',
+        memberName: '',
+        email: '',
+        hpno: '',
+        clncd: '+82',
+        addr: '',
+        addrDtlCn: '',
+        zip: '',
+        qlfcNo: '',
+        carrer: '',
+        createUserId: '',
+        createDt: '',
+        updateUserId: '',
+        updateDt: ''
+      }
+    ],
+    arcrftList: [
+      {
+        planArcrftSno: 0,
+        planSno: 0,
+        arcrftSno: 0,
+        idntfNum: '',
+        groupNm: '',
+        prdctNum: '',
+        arcrftTypeCd: '',
+        arcrftModelNm: '',
+        prdctCmpnNm: '',
+        prdctDate: '',
+        arcrftLngth: 0,
+        arcrftWdth: 0,
+        arcrftHght: 0,
+        arcrftWght: 0,
+        wghtTypeCd: '',
+        imageUrl: '',
+        takeoffWght: 0,
+        useYn: '',
+        cameraYn: '',
+        insrncYn: '',
+        ownerNm: '',
+        createUserId: '',
+        createDt: '',
+        updateUserId: '',
+        updateDt: ''
+      }
+    ]
+  }
 };

src/modules/laanc/reducers/laancReducers.ts

@@ -9,12 +9,17 @@ import { laancPdfAction } from '../actions/laancActions';
 
 import {
   LaancFlightData,
+  laancControlData,
   laancState,
-  laancControlData
+  initFlightBas
 } from '../models/laancModels';
 
 export const laancReducer = createReducer<laancState, Actions.LaancAction>(
   laancControlData
+).handleAction(Actions.laancFlightApproval.success, (state, action) =>
+  produce(state, draft => {
+    draft.detail = initFlightBas.initDetail;
+  })
 );
 
 // handleAction(Actions.laancFlightApproval.success, (state, action) =>

src/modules/laanc/sagas/laancSagas.ts

@@ -1,7 +1,9 @@
 import { call, put, select, takeEvery } from '@redux-saga/core/effects';
 import * as Actions from '../actions/laancActions';
 import { ActionType } from 'typesafe-actions';
-
+import * as MessageActions from '../../comn/message/actions/comnMessageAction';
+import * as Apis from '../apis/laancApi';
+import { ERROR_MESSAGE, SAVE_MESSAGE } from '../../../configs/constants';
 // pdf 연결
 function* getLaancPdfsaga(
   action: ActionType<typeof Actions.laancPdfAction.request>
@@ -10,7 +12,34 @@ function* getLaancPdfsaga(
 // laanc 승인 여부
 function* postApprovalsata(
   action: ActionType<typeof Actions.laancFlightApproval.request>
-) {}
+) {
+  try {
+    const detail = action.payload;
+
+    const res = yield call(Apis.laancApi.postApproval, detail);
+
+    const { data } = res;
+
+    yield put(
+      MessageActions.IS_MESSAGE({
+        messageCode: SAVE_MESSAGE.code,
+        message: SAVE_MESSAGE.message,
+        isHistoryBack: true,
+        isRefresh: false
+      })
+    );
+  } catch (error) {
+    yield put(
+      MessageActions.IS_ERROR({
+        errorCode: ERROR_MESSAGE.code,
+        errorMessage: ERROR_MESSAGE.message,
+        isHistoryBack: false,
+        isRefresh: false
+      })
+    );
+    // yield put(Actions.FLIGHT_PLAN_CREATE.failure(error));
+  }
+}
 
 export function* laancSaga() {
   yield takeEvery(Actions.laancPdfAction.request, getLaancPdfsaga);

src/views/laanc/LaacnStep3.js

@@ -28,6 +28,19 @@ export default function LaacnStep3({
   setCenteredModal,
   handleChange
 }) {
+  const obj = {
+    commercial: {
+      COMMERCIAL: '사업',
+      NON_COMMERCIAL: '비사업'
+    },
+    arcrftWdth: {
+      7: '최대이륙중량 250g 이하',
+      8: '250g초과 ~ 2kg 이하',
+      9: '2kg초과~7kg이하',
+      10: '7kg초과~25kg이하',
+      11: '25kg초과'
+    }
+  };
   const [centeredModal2, setCenteredModal2] = useState(false);
   const { user } = useSelector(state => state.authState);
   return (
@@ -85,7 +98,7 @@ export default function LaacnStep3({
                         bsSize='sm'
                         placeholder=''
                         disabled
-                        value={data.commercial}
+                        value={obj.commercial[data.commercial]}
                       />
                     </FormGroup>
                   </Col>
@@ -149,7 +162,7 @@ export default function LaacnStep3({
                         bsSize='sm'
                         placeholder=''
                         disabled
-                        value={data.arcrftList[0].arcrftWdth}
+                        value={obj.arcrftWdth[data.arcrftList[0].arcrftWdth]}
                       />
                     </FormGroup>
                   </Col>
@@ -239,7 +252,10 @@ export default function LaacnStep3({
               <strong className='text-success'>
                 신청하신 비행요청이 승인되었습니다.{' '}
               </strong>
-              <span>조종자 준수사항을 다시 확인부탁드리며, <br/>자세한 사항은 발송된 문자를 확인해주시기 바랍니다.</span>
+              <span>
+                조종자 준수사항을 다시 확인부탁드리며, <br />
+                자세한 사항은 발송된 문자를 확인해주시기 바랍니다.
+              </span>
             </div>
           </ModalBody>
           <ModalFooter>

src/views/laanc/LaancStep1.js

@@ -125,8 +125,8 @@ export default function LaancStep1({
                   }}
                 >
                   <option value=''>= 선택 =</option>
-                  <option value={'사업'}>사업</option>
+                  <option value='COMMERCIAL'>사업</option>
-                  <option value={'비사업'}>비사업</option>
+                  <option value='NON_COMMERCIAL'>비사업</option>
                 </Input>
               </FormGroup>
             </Col>
@@ -212,22 +212,23 @@ export default function LaancStep1({
                       }}
                     >
                       <option value=''>= 선택 =</option>
-                      <option value='교육비행'>= 교육비행 =</option>
+                      <option value='06'>= 교육비행 =</option>
-                      <option value='교통관리'>= 교통관리 =</option>
+                      <option value='02'>= 교통관리 =</option>
-                      <option value='공중광고'>= 공중광고 =</option>
+                      <option value='05'>= 공중광고 =</option>
-                      <option value='계도비행'>= 계도비행 =</option>
+                      <option value='15'>= 계도비행 =</option>
-                      <option value='농약살포'>= 농약살포 =</option>
+                      <option value='08'>= 농약살포 =</option>
-                      <option value='레저비행'>= 레저비행 =</option>
+                      <option value='03'>= 레저비행 =</option>
-                      <option value='사진/영상촬영'>= 사진/영상촬영 =</option>
+                      <option value='11'>= 사진/영상촬영 =</option>
-                      <option value='수송'>= 수송 =</option>
+                      <option value='10'>= 수송 =</option>
-                      <option value='수색구조'>= 수색구조 =</option>
+                      <option value='12'>= 수색구조 =</option>
-                      <option value='시험비행'>= 시험비행 =</option>
+                      <option value='04'>= 시험비행 =</option>
-                      <option value='산림관측'>= 산림관측 =</option>
+                      <option value='09'>= 산림관측 =</option>
-                      <option value='비행교육'>= 비행교육 =</option>
+                      <option value='14'>= 비행교육 =</option>
-                      <option value='비행시연'>= 비행시연 =</option>
+                      <option value='07'>= 비행시연 =</option>
-                      <option value='비행실기시험'>= 비행실기시험 =</option>
+                      <option value='17'>= 비행실기시험 =</option>
-                      <option value='비행훈련'>= 비행훈련 =</option>
+                      <option value='13'>= 비행훈련 =</option>
-                      <option value='항공측량'>= 항공측량 =</option>
+                      <option value='16'>= 항공측량 =</option>
+                      <option value='01'>= 항공방제 =</option>
                     </Input>
                   </FormGroup>
                 </Col>
@@ -379,26 +380,18 @@ export default function LaancStep1({
                       }}
                     >
                       <option value=''>= 선택 =</option>
-                      <option value='최대이륙중량 250g 이하'>
+                      <option value='7'>= 최대이륙중량 250g 이하 =</option>
-                        = 최대이륙중량 250g 이하 =
+                      <option value='8'>= 250g초과 ~ 2kg 이하 =</option>
-                      </option>
+                      <option value='9'>= 2kg초과~7kg이하 =</option>
-                      <option value='250g초과 ~ 2kg 이하'>
+                      <option value='10'>= 7kg초과~25kg이하 =</option>
-                        = 250g초과 ~ 2kg 이하 =
+                      <option value='11'>= 25kg초과 =</option>
-                      </option>
-                      <option value='2kg초과~7kg이하'>
-                        = 2kg초과~7kg이하 =
-                      </option>
-                      <option value='7kg초과~25kg이하'>
-                        = 7kg초과~25kg이하 =
-                      </option>
-                      <option value='25kg초과'>= 25kg초과 =</option>
                     </Input>
                   </FormGroup>
                 </Col>
-                {data.commercial === '사업' ||
+                {data.commercial === 'COMMERCIAL' ||
-                data.arcrftList[0].arcrftWdth == '25kg초과' ||
+                data.arcrftList[0].arcrftWdth == '11' ||
-                data.arcrftList[0].arcrftWdth == '2kg초과~7kg이하' ||
+                data.arcrftList[0].arcrftWdth == '10' ||
-                data.arcrftList[0].arcrftWdth == '7kg초과~25kg이하' ? (
+                data.arcrftList[0].arcrftWdth == '9' ? (
                   <>
                     <Col className='list-input' md='4'>
                       <FormGroup>
@@ -421,10 +414,10 @@ export default function LaancStep1({
                           }}
                         >
                           <option value=''>= 선택 =</option>
-                          <option>무인 비행기</option>
+                          <option value='11'>무인 비행기</option>
-                          <option>무인 비행선</option>
+                          <option value='21'>무인 비행선</option>
-                          <option>무인 멀티콥터</option>
+                          <option value='12'>무인 멀티콥터</option>
-                          <option>무인 헬리콥터</option>
+                          <option value='13'>무인 헬리콥터</option>
                         </Input>
                       </FormGroup>
                     </Col>

src/views/laanc/LaancStep2.js

@@ -49,6 +49,19 @@ export default function LaancStep2({
   setCenteredModal,
   handlerLaancClose
 }) {
+  const obj = {
+    commercial: {
+      COMMERCIAL: '사업',
+      NON_COMMERCIAL: '비사업'
+    },
+    arcrftWdth: {
+      7: '최대이륙중량 250g 이하',
+      8: '250g초과 ~ 2kg 이하',
+      9: '2kg초과~7kg이하',
+      10: '7kg초과~25kg이하',
+      11: '25kg초과'
+    }
+  };
   const [isterms, setIsterms] = useState(false);
   const [detailData, setDetailData] = useState(initFlightBas.initDetail);
   const { user } = useSelector(state => state.authState);
@@ -75,6 +88,7 @@ export default function LaancStep2({
     return Math.round(number * multiplier) / multiplier;
   };
 
+  console.log('>>>>>>>>>', data);
   return (
     <>
       <ModalHeader>
@@ -218,16 +232,13 @@ export default function LaancStep2({
                   <span className='necessary'>*</span>승인 유형
                 </Label>
                 <Input
-                  type='select'
+                  type='text'
                   name='commercial'
-                  value={data.commercial}
+                  value={obj.commercial[data.commercial]}
                   size='sm'
                   id='commercial'
                   disabled
-                >
+                />
-                  <option>사업</option>
-                  <option>비사업</option>
-                </Input>
               </FormGroup>
             </Col>
             <Col className='list-input' md='12'>
@@ -278,9 +289,10 @@ export default function LaancStep2({
                     </Label>
                     <Input
                       type='text'
-                      id='test'
+                      id='arcrftWdth'
+                      name='arcrftWdth'
                       size='sm'
-                      value={data.arcrftList[0].arcrftWdth}
+                      value={obj.arcrftWdth[data.arcrftList[0].arcrftWdth]}
                       placeholder=''
                       disabled
                     />