feat: 지붕재 적합성 조회 데이터 포멧 변경 및 조회 로직 수정

Reviewed-on: #38

.env

@@ -6,6 +6,7 @@
 
 # DATABASE_URL="sqlserver://3team.devgrr.kr:1433;database=onsitesurvey;user=sa;password=1q2w3e4r!;encrypt=true;trustServerCertificate=true;"
 DATABASE_URL="sqlserver://3team.devgrr.kr:1433;database=onsitesurvey;user=sa;password=1q2w3e4r!;encrypt=true;trustServerCertificate=true;"
+# DATABASE_URL="mysql://root:root@localhost:3306/onsitesurvey"
 
 # SESSION_PASSWORD="QWERASDFZXCV1234567890REWQFDSAVCXZ"
 SESSION_PASSWORD="This application is for mobile field research"

next.config.ts

@@ -12,10 +12,10 @@ const nextConfig: NextConfig = {
         source: '/api/user/login',
         destination: `${process.env.NEXT_PUBLIC_QSP_API_URL}/api/user/login`,
       },
-      {
-        source: '/api/:path*',
-        destination: `${process.env.NEXT_PUBLIC_API_URL}/api/:path*`,
-      },
+      // {
+      //   source: '/api/:path*',
+      //   destination: `${process.env.NEXT_PUBLIC_API_URL}/api/:path*`,
+      // },
     ]
   },
 }

package.json

@@ -14,6 +14,7 @@
     "@tanstack/react-query-devtools": "^5.71.0",
     "axios": "^1.8.4",
     "iron-session": "^8.0.4",
+    "lucide": "^0.503.0",
     "mssql": "^11.0.1",
     "next": "15.2.4",
     "react": "^19.0.0",

pnpm-lock.yaml

@@ -23,6 +23,9 @@ importers:
       iron-session:
         specifier: ^8.0.4
         version: 8.0.4
+      lucide:
+        specifier: ^0.503.0
+        version: 0.503.0
       mssql:
         specifier: ^11.0.1
         version: 11.0.1
@@ -1109,6 +1112,9 @@ packages:
   lodash.once@4.1.1:
     resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
 
+  lucide@0.503.0:
+    resolution: {integrity: sha512-ZAVlxBU4dbSUAVidb2eT0fH3bTtKCj7M2aZNAVsFOrcnazvYJFu6I8OxFE+Fmx5XNf22Cw4Ln3NBHfBxNfoFOw==}
+
   math-intrinsics@1.1.0:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
@@ -2340,6 +2346,8 @@ snapshots:
 
   lodash.once@4.1.1: {}
 
+  lucide@0.503.0: {}
+
   math-intrinsics@1.1.0: {}
 
   micromatch@4.0.8:

prisma/schema.prisma

@@ -195,6 +195,8 @@ model MS_SUITABLE_DETAIL {
   REG_DT                            DateTime         @default(now(), map: "DF__MS_SUITAB__creat__571DF1D5")
   UPT_DT                            DateTime?
   MS_SUITABLE_MAIN                  MS_SUITABLE_MAIN @relation(fields: [MAIN_ID], references: [ID], onUpdate: NoAction, map: "MS_SUITABLE_DETAIL_MS_SUITABLE_MAIN_FK")
+
+  @@index([MAIN_ID, TRESTLE_MANUFACTURER_PRODUCT_NAME], map: "MS_SUITABLE_DETAIL_MAIN_ID_IDX")
 }
 
 model MS_SUITABLE_MAIN {
@@ -206,4 +208,17 @@ model MS_SUITABLE_MAIN {
   REG_DT             DateTime             @default(now(), map: "DF__MS_SUITAB__creat__5441852A")
   UPT_DT             DateTime?
   MS_SUITABLE_DETAIL MS_SUITABLE_DETAIL[]
+
+  @@index([PRODUCT_NAME], map: "MS_SUITABLE_MAIN_PRODUCT_NAME_IDX")
+  @@index([ROOF_MT_CD, PRODUCT_NAME], map: "MS_SUITABLE_MAIN_ROOF_MT_CD_IDX")
+}
+
+/// The underlying table does not contain a valid unique identifier and can therefore currently not be handled by Prisma Client.
+model MS_USR_TRK {
+  ID     Int      @id @default(autoincrement())
+  OWNER  String   @db.VarChar(100)
+  TYPE   String   @db.VarChar(50)
+  URL    String?  @db.VarChar(200)
+  REG_DT DateTime @default(now())
+  DATA   String?  @db.VarChar(200)
 }

public/assets/images/common/btn_arr_up.svg

@@ -0,0 +1,3 @@
+<svg width="10" height="6" viewBox="0 0 10 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 5L5 1L9 5" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg> 

src/app/api/suitable/list/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from 'next/server'
 import { prisma } from '@/libs/prisma'
-import { SUITABLE_HEAD_CODE } from '@/types/Suitable'
+import { SUITABLE_HEAD_CODE, type SuitableMain } from '@/types/Suitable'
 
 export async function GET(request: NextRequest) {
   try {
@@ -8,29 +8,24 @@ export async function GET(request: NextRequest) {
     const category = searchParams.get('category')
     const keyword = searchParams.get('keyword')
 
-    let whereCondition: any = {}
+    let MainWhereCondition: any = {}
+    const whereCondition: string[] = []
+    const params: string[] = []
     if (category) {
-      whereCondition[SUITABLE_HEAD_CODE.ROOF_MT_CD] = category
+      whereCondition.push(`${SUITABLE_HEAD_CODE.ROOF_MT_CD} = @P1`)
+      params.push(category)
+      MainWhereCondition[SUITABLE_HEAD_CODE.ROOF_MT_CD] = category
     }
     if (keyword) {
-      whereCondition['PRODUCT_NAME'] = {
+      whereCondition.push('PRODUCT_NAME LIKE @P2')
+      params.push(`%${keyword}%`)
+      MainWhereCondition['PRODUCT_NAME'] = {
         contains: keyword,
       }
     }
+    const startTime = performance.now()
+    console.log(`쿼리 (main table) 시작 시간: ${startTime}ms`)
 
-    // // 1 include 사용
-    // // @ts-ignore
-    // const suitable = await prisma.MS_SUITABLE_MAIN.findMany({
-    //   where: whereCondition,
-    //   include: {
-    //     MS_SUITABLE_DETAIL: true,
-    //   },
-    //   orderBy: {
-    //     PRODUCT_NAME: 'asc',
-    //   },
-    // })
-
-    // 2 include 안쓰고 따로 쿼리, 쓸거만 골라서 조회
     // @ts-ignore
     const suitable = await prisma.MS_SUITABLE_MAIN.findMany({
       select: {
@@ -38,31 +33,50 @@ export async function GET(request: NextRequest) {
         PRODUCT_NAME: true,
         ROOF_MT_CD: true,
       },
-      where: whereCondition,
+      where: MainWhereCondition,
       orderBy: {
         PRODUCT_NAME: 'asc',
       },
     })
-    // @ts-ignore
-    const suitableDetail = await prisma.MS_SUITABLE_DETAIL.findMany({
-      select: {
-        ID: true,
-        MAIN_ID: true,
-        TRESTLE_MFPC_CD: true,
-        TRESTLE_MANUFACTURER_PRODUCT_NAME: true,
-        MEMO: true,
-      },
-      where: whereCondition
-        ? {
-            MAIN_ID: {
-              in: suitable.map((suitable: { ID: number }) => suitable.ID),
-            },
-          }
-        : undefined,
-      orderBy: [{ MAIN_ID: 'asc' }, { TRESTLE_MANUFACTURER_PRODUCT_NAME: 'asc' }],
-    })
 
-    return NextResponse.json({ suitable, suitableDetail })
+    const endTime = performance.now()
+    console.log(`쿼리 (main table) 종료 시간: ${endTime - startTime}ms`)
+
+    const mainIds: number[] = suitable.map((item: SuitableMain) => item.id)
+
+
+    const startTime2 = performance.now()
+    console.log(`쿼리 (detail table) 시작 시간: ${startTime2}ms`)
+    let detailQuery = `
+    SELECT
+      msd.main_id
+      , (
+        SELECT
+          msd_json.id
+          , msd_json.trestle_mfpc_cd
+          , msd_json.trestle_manufacturer_product_name
+          , msd_json.memo
+        FROM ms_suitable_detail msd_json
+          WHERE msd.main_id = msd_json.main_id
+        FOR JSON PATH
+      ) AS detail
+    FROM ms_suitable_detail msd
+    -- WHERE 1=1
+    GROUP BY msd.main_id
+    `
+    if (whereCondition.length > 0) {
+      detailQuery = detailQuery.replace('-- WHERE 1=1', `WHERE msd.main_id IN @P1`)
+    }
+    // @ts-ignore
+    const detail = await prisma.$queryRawUnsafe(detailQuery, ...mainIds)
+
+    const endTime2 = performance.now()
+    console.log(`쿼리 (detail table) 종료 시간: ${endTime2 - startTime2}ms`)
+
+    const endTime3 = performance.now()
+    console.log(`쿼리 총 실행 시간: ${endTime3 - startTime}ms`)
+
+    return NextResponse.json({ suitable, detail })
   } catch (error) {
     console.error('❌ 데이터 조회 중 오류가 발생했습니다:', error)
     return NextResponse.json({ error: '데이터 조회 중 오류가 발생했습니다' }, { status: 500 })

src/app/api/suitable/list/test/route.ts

@@ -0,0 +1,71 @@
+import { NextRequest, NextResponse } from 'next/server'
+import { prisma } from '@/libs/prisma'
+import { SUITABLE_HEAD_CODE, type Suitable } from '@/types/Suitable'
+
+export async function GET(request: NextRequest) {
+  try {
+    const searchParams = request.nextUrl.searchParams
+    const category = searchParams.get('category')
+    const keyword = searchParams.get('keyword')
+
+    const whereCondition: string[] = []
+    const params: string[] = []
+    if (category) {
+      whereCondition.push(`${SUITABLE_HEAD_CODE.ROOF_MT_CD} = @P1`)
+      params.push(category)
+    }
+    if (keyword) {
+      whereCondition.push('PRODUCT_NAME LIKE @P2')
+      params.push(`%${keyword}%`)
+    }
+
+    const startTime = performance.now()
+    console.log(`쿼리 시작 시간: ${startTime}ms`)
+
+    let query = `
+    SELECT 
+      msm.id
+      , msm.product_name
+      , msm.manu_ft_cd
+      , msm.roof_mt_cd
+      , msm.roof_sh_cd
+      , details.detail
+    FROM ms_suitable_main msm
+    LEFT JOIN (
+      SELECT
+        msd.main_id
+        , (
+          SELECT
+            msd_json.id
+            , msd_json.trestle_mfpc_cd
+            , msd_json.trestle_manufacturer_product_name
+            , msd_json.memo
+          FROM ms_suitable_detail msd_json
+            WHERE msd.main_id = msd_json.main_id
+          FOR JSON PATH
+        ) AS detail
+      FROM ms_suitable_detail msd
+      GROUP BY msd.main_id
+    ) AS details 
+      ON msm.id = details.main_id 
+        -- AND details.main_id IN (#mainIds)
+    -- WHERE 1=1
+    ORDER BY msm.product_name`
+
+    // 검색 조건 추가
+    if (whereCondition.length > 0) {
+      query = query.replace('-- WHERE 1=1', `WHERE ${whereCondition.join(' AND ')}`)
+    }
+
+    // @ts-ignore
+    const suitable: Suitable[] = await prisma.$queryRawUnsafe(query, ...params)
+
+    const endTime = performance.now()
+    console.log(`쿼리 실행 시간: ${endTime - startTime}ms`)
+
+    return NextResponse.json(suitable)
+  } catch (error) {
+    console.error('❌ 데이터 조회 중 오류가 발생했습니다:', error)
+    return NextResponse.json({ error: '데이터 조회 중 오류가 발생했습니다' }, { status: 500 })
+  }
+}

src/app/api/survey-sale/[id]/route.ts

@@ -1,73 +0,0 @@
-import { NextResponse } from 'next/server'
-
-// export async function POST(request: Request, { params }: { params: { id: string } }) {
-//   const body = await request.json()
-//   const { id } = params
-
-//   // @ts-ignore
-//   const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.update({
-//     where: { id: Number(id) },
-//     data: {
-//       detail_info: {
-//         create: body,
-//       },
-//     },
-//   })
-//   return NextResponse.json({ message: 'Survey detail created successfully' })
-// }
-
-// export async function GET(request: Request, { params }: { params: { id: string } }) {
-//   const { id } = params
-//   // @ts-ignore
-//   const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.findUnique({
-//     where: { id: Number(id) },
-//     include: {
-//       detail_info: true,
-//     },
-//   })
-//   return NextResponse.json(survey)
-// }
-
-// export async function PUT(request: Request, { params }: { params: { id: string } }) {
-//   const { id } = params
-//   const body = await request.json()
-//   // @ts-ignore
-//   const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.update({
-//     where: { id: Number(id) },
-//     data: {
-//       ...body,
-//       detail_info: {
-//         update: body.detail_info,
-//       },
-//     },
-//   })
-//   return NextResponse.json(survey)
-// }
-
-// export async function DELETE(request: Request, { params }: { params: { id: string; detail_id: string } }) {
-//   const { id, detail_id } = params
-//   if (detail_id) {
-//     // @ts-ignore
-//     const survey = await prisma.SD_SERVEY_SALES_DETAIL_INFO.delete({
-//       where: { id: Number(detail_id) },
-//     })
-//   } else {
-//     // @ts-ignore
-//     const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.delete({
-//       where: { id: Number(id) },
-//     })
-//   }
-//   return NextResponse.json({ message: 'Survey deleted successfully' })
-// }
-
-// export async function PATCH(request: Request, { params }: { params: { id: string } }) {
-//   const { id } = params
-//   // @ts-ignore
-//   const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.update({
-//     where: { id: Number(id) },
-//     data: {
-//       submission_status: true,
-//     },
-//   })
-//   return NextResponse.json({ message: 'Survey confirmed successfully' })
-// }

src/app/api/survey-sale/route.ts

@@ -1,33 +0,0 @@
-import { NextResponse } from 'next/server'
-import { prisma } from '@/libs/prisma'
-
-export async function POST(request: Request) {
-  const body = await request.json()
-  // @ts-ignore
-  const res = await prisma.SD_SERVEY_SALES_BASIC_INFO.create({
-    data: body,
-  })
-  return NextResponse.json(res)
-}
-
-export async function GET() {
-  try {
-    // @ts-ignore
-    const res = await prisma.SD_SERVEY_SALES_BASIC_INFO.findMany()
-    return NextResponse.json(res)
-  } catch (error) {
-    console.error(error)
-  }
-}
-
-export async function PUT(request: Request) {
-  const body = await request.json()
-  console.log('🚀 ~ PUT ~ body:', body)
-  const detailInfo = { ...body.detail_info, basic_info_id: body.id }
-  console.log('🚀 ~ PUT ~ detailInfo:', detailInfo)
-  // @ts-ignore
-  const res = await prisma.SD_SERVEY_SALES_DETAIL_INFO.create({
-    data: detailInfo,
-  })
-  return NextResponse.json({ message: 'Survey sales updated successfully' })
-}

src/app/api/survey-sales/[id]/route.ts

@@ -0,0 +1,139 @@
+import { NextResponse } from 'next/server'
+import { prisma } from '@/libs/prisma'
+
+export async function GET(request: Request, context: { params: { id: string } }) {
+  try {
+    const { id } = await context.params
+    // @ts-ignore
+    const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.findUnique({
+      where: { ID: Number(id) },
+      include: {
+        DETAIL_INFO: true,
+      },
+    })
+    return NextResponse.json(survey)
+  } catch (error) {
+    console.error('Error fetching survey:', error)
+    return NextResponse.json({ error: 'Failed to fetch survey' }, { status: 500 })
+  }
+}
+
+export async function PUT(request: Request, context: { params: { id: string } }) {
+  try {
+    const { id } = await context.params
+    const body = await request.json()
+    console.log('body:: ', body)
+
+    // DETAIL_INFO를 분리
+    const { DETAIL_INFO, ...basicInfo } = body
+
+    // @ts-ignore
+    const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
+      where: { ID: Number(id) },
+      data: {
+        ...basicInfo,
+        UPT_DT: new Date(),
+        DETAIL_INFO: DETAIL_INFO
+          ? {
+              upsert: {
+                create: DETAIL_INFO,
+                update: DETAIL_INFO,
+              },
+            }
+          : undefined,
+      },
+      include: {
+        DETAIL_INFO: true,
+      },
+    })
+    return NextResponse.json(survey)
+  } catch (error) {
+    console.error('Error updating survey:', error)
+    return NextResponse.json({ error: 'Failed to update survey' }, { status: 500 })
+  }
+}
+
+export async function DELETE(request: Request, context: { params: { id: string } }) {
+  try {
+    const { id } = await context.params
+
+    await prisma.$transaction(async (tx) => {
+      // @ts-ignore
+      const detailData = await tx.SD_SURVEY_SALES_BASIC_INFO.findUnique({
+        where: { ID: Number(id) },
+        select: {
+          DETAIL_INFO: true,
+        },
+      })
+
+      if (detailData?.DETAIL_INFO?.ID) {
+        // @ts-ignore
+        await tx.SD_SURVEY_SALES_DETAIL_INFO.delete({
+          where: { ID: Number(detailData.DETAIL_INFO.ID) },
+        })
+      }
+
+      // @ts-ignore
+      await tx.SD_SURVEY_SALES_BASIC_INFO.delete({
+        where: { ID: Number(id) },
+      })
+    })
+
+    return NextResponse.json({ message: 'Survey deleted successfully' })
+  } catch (error) {
+    console.error('Error deleting survey:', error)
+    return NextResponse.json({ error: 'Failed to delete survey' }, { status: 500 })
+  }
+}
+
+export async function PATCH(request: Request, context: { params: { id: string } }) {
+  try {
+    const { id } = await context.params
+    const body = await request.json()
+
+    if (body.submit) {
+      // @ts-ignore
+      const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
+        where: { ID: Number(id) },
+        data: {
+          SUBMISSION_STATUS: true,
+          SUBMISSION_DATE: new Date(),
+        },
+      })
+      return NextResponse.json({ message: 'Survey confirmed successfully' })
+    } else {
+      // @ts-ignore
+      const hasDetails = await prisma.SD_SURVEY_SALES_DETAIL_INFO.findUnique({
+        where: { BASIC_INFO_ID: Number(id) },
+      })
+
+      if (hasDetails) {
+        //@ts-ignore
+        const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
+          where: { ID: Number(id) },
+          data: {
+            UPT_DT: new Date(),
+            DETAIL_INFO: {
+              update: body.DETAIL_INFO,
+            },
+          },
+        })
+        return NextResponse.json(result)
+      } else {
+        // @ts-ignore
+        const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
+          where: { ID: Number(id) },
+          data: {
+            DETAIL_INFO: {
+              create: body.DETAIL_INFO,
+            },
+          },
+        })
+        return NextResponse.json({ message: 'Survey detail created successfully' })
+      }
+    }
+  } catch (error) {
+    console.error('Error updating survey:', error)
+    return NextResponse.json({ error: 'Failed to update survey' }, { status: 500 })
+  }
+}

src/app/api/survey-sales/route.ts

@@ -0,0 +1,241 @@
+import { NextResponse } from 'next/server'
+import { prisma } from '@/libs/prisma'
+
+/**
+ * 검색 파라미터
+ */
+type SearchParams = {
+  keyword?: string | null // 검색어
+  searchOption?: string | null // 검색 옵션 (select 옵션)
+  isMySurvey?: string | null // 내가 작성한 매물
+  sort?: string | null // 정렬 방식
+  offset?: string | null
+  role?: string | null // 회원권한한
+  store?: string | null // 판매점ID
+  builderNo?: string | null // 시공ID
+}
+
+type WhereCondition = {
+  AND: any[]
+  OR?: any[]
+  [key: string]: any
+}
+
+// 검색 가능한 필드 옵션
+const SEARCH_OPTIONS = [
+  'BUILDING_NAME', // 건물명
+  'REPRESENTATIVE', // 담당자
+  'STORE', // 판매점
+  'CONSTRUCTION_POINT', // 시공점
+  'CUSTOMER_NAME', // 고객명
+  'POST_CODE', // 우편번호
+  'ADDRESS', // 주소
+  'ADDRESS_DETAIL', // 상세주소
+] as const
+
+// 페이지당 항목 수
+const ITEMS_PER_PAGE = 10
+
+/**
+ * 키워드 검색 조건 생성 함수
+ * @param keyword 검색 키워드
+ * @param searchOption 검색 옵션
+ * @returns 검색 조건 객체
+ */
+const createKeywordSearchCondition = (keyword: string, searchOption: string): WhereCondition => {
+  const where: WhereCondition = { AND: [] }
+
+  if (searchOption === 'all') {
+    // 모든 필드 검색 시 OR 조건 사용
+    where.OR = []
+
+    // ID가 숫자인 경우 ID 검색 조건 추가
+    if (keyword.match(/^\d+$/) || !isNaN(Number(keyword))) {
+      where.OR.push({
+        ID: { equals: Number(keyword) },
+      })
+    }
+
+    where.OR.push(
+      ...SEARCH_OPTIONS.map((field) => ({
+        [field]: { contains: keyword },
+      })),
+    )
+  } else if (SEARCH_OPTIONS.includes(searchOption.toUpperCase() as any)) {
+    // 특정 필드 검색
+    where[searchOption.toUpperCase()] = { contains: keyword }
+  } else if (searchOption === 'id') {
+    // ID 검색 (숫자 변환 필요)
+    const number = Number(keyword)
+    if (!isNaN(number)) {
+      where.ID = { equals: number }
+    } else {
+      // 유효하지 않은 ID 검색 시 빈 결과 반환
+      where.ID = { equals: null }
+    }
+  }
+  return where
+}
+
+/**
+ * 회원 역할별 검색 조건 생성 함수
+ * @param params 검색 파라미터
+ * @returns 검색 조건 객체
+ */
+const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
+  const where: WhereCondition = { AND: [] }
+
+  switch (params.role) {
+    case 'Admin': // 1차점
+      // 같은 판매점에서 작성된 매물 + 2차점에서 제출받은 매물
+      where.OR = [
+        {
+          AND: [{ STORE: { equals: params.store } }],
+        },
+        {
+          AND: [{ STORE: { startsWith: params.store } }, { SUBMISSION_STATUS: { equals: true } }],
+        },
+      ]
+      break
+
+    case 'Admin_Sub': // 2차점
+      where.OR = [
+        {
+          AND: [
+            { STORE: { equals: params.store } },
+            {
+              OR: [{ CONSTRUCTION_POINT: { equals: null } }, { CONSTRUCTION_POINT: { equals: '' } }],
+            },
+          ],
+        },
+        {
+          AND: [
+            { STORE: { equals: params.store } },
+            { CONSTRUCTION_POINT: { not: null } },
+            { CONSTRUCTION_POINT: { not: '' } },
+            { SUBMISSION_STATUS: { equals: true } },
+          ],
+        },
+      ]
+      break
+
+    case 'Builder': // 2차점 시공권한
+    case 'Partner': // Partner
+      // 같은 시공ID에서 작성된 매물
+      where.AND?.push({
+        CONSTRUCTION_POINT: { equals: params.builderNo },
+      })
+      break
+
+    case 'T01':
+    case 'User':
+      // 모든 매물 조회 가능 (추가 조건 없음)
+      break
+  }
+
+  return where
+}
+
+/**
+ * GET 핸들러 - 설문 목록 조회
+ */
+export async function GET(request: Request) {
+  try {
+    // URL 파라미터 파싱
+    const { searchParams } = new URL(request.url)
+    const params: SearchParams = {
+      keyword: searchParams.get('keyword'),
+      searchOption: searchParams.get('searchOption'),
+      isMySurvey: searchParams.get('isMySurvey'),
+      sort: searchParams.get('sort'),
+      offset: searchParams.get('offset'),
+      role: searchParams.get('role'),
+      store: searchParams.get('store'),
+      builderNo: searchParams.get('builderNo'),
+    }
+
+    // 검색 조건 구성
+    const where: WhereCondition = { AND: [] }
+
+    // 내가 작성한 매물 조건 적용
+    if (params.isMySurvey) {
+      where.AND.push({ REPRESENTATIVE: params.isMySurvey })
+    }
+
+    // 키워드 검색 조건 적용
+    if (params.keyword && params.searchOption) {
+      where.AND.push(createKeywordSearchCondition(params.keyword, params.searchOption))
+    }
+
+    // 회원 유형 조건 적용
+    const roleCondition = createMemberRoleCondition(params)
+    if (Object.keys(roleCondition).length > 0) {
+      where.AND.push(roleCondition)
+    }
+
+    // 페이지네이션 데이터 조회
+    //@ts-ignore
+    const surveys = await prisma.SD_SURVEY_SALES_BASIC_INFO.findMany({
+      where,
+      orderBy: params.sort === 'created' ? { REG_DT: 'desc' } : { UPT_DT: 'desc' },
+      skip: Number(params.offset),
+      take: ITEMS_PER_PAGE,
+    })
+    // 전체 개수만 조회
+    //@ts-ignore
+    const count = await prisma.SD_SURVEY_SALES_BASIC_INFO.count({ where })
+    return NextResponse.json({ data: { data: surveys, count: count } })
+  } catch (error) {
+    console.error(error)
+    return NextResponse.json({ error: 'Fail Read Survey' }, { status: 500 })
+  }
+}
+
+/**
+ * PUT 핸들러 - 상세 정보 추가
+ */
+export async function PUT(request: Request) {
+  try {
+    const body = await request.json()
+
+    // 상세 정보 생성을 위한 데이터 구성
+    const detailInfo = {
+      ...body.detail_info,
+      BASIC_INFO_ID: body.id,
+    }
+
+    // 상세 정보 생성
+    //@ts-ignore
+    await prisma.SD_SURVEY_SALES_DETAIL_INFO.create({
+      data: detailInfo,
+    })
+
+    return NextResponse.json({
+      message: 'Success Update Survey',
+    })
+  } catch (error) {
+    console.error(error)
+    return NextResponse.json({ error: 'Fail Update Survey' }, { status: 500 })
+  }
+}
+
+export async function POST(request: Request) {
+  try {
+    const body = await request.json()
+    const { DETAIL_INFO, ...basicInfo } = body
+    // 기본 정보 생성
+    //@ts-ignore
+    const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({
+      data: {
+        ...basicInfo,
+        DETAIL_INFO: {
+          create: DETAIL_INFO,
+        },
+      },
+    })
+    return NextResponse.json(result)
+  } catch (error) {
+    console.error(error)
+    return NextResponse.json({ error: 'Fail Create Survey' }, { status: 500 })
+  }
+}

src/app/api/tracking/route.ts

@@ -0,0 +1,33 @@
+import type { SessionData } from '@/types/Auth'
+import { NextResponse } from 'next/server'
+import { cookies } from 'next/headers'
+import { Prisma } from '@prisma/client'
+import { getIronSession } from 'iron-session'
+import { sessionOptions } from '@/libs/session'
+
+export const POST = async (request: Request) => {
+  const { url, data } = await request.json()
+
+  const cookieStore = await cookies()
+  const session = await getIronSession<SessionData>(cookieStore, sessionOptions)
+
+  let owner = session.userId
+  let type = ''
+  if (url.includes('api')) {
+    type = 'api'
+  } else {
+    type = 'page'
+  }
+
+  // @ts-ignore
+  const result = await Prisma.MS_USR_TRK.create({
+    data: {
+      owner,
+      type,
+      url,
+      data: JSON.stringify(data),
+    },
+  })
+
+  return NextResponse.json({ message: 'Tracking data received', result })
+}

src/app/layout.tsx

@@ -22,7 +22,7 @@ interface RootLayoutProps {
   header: ReactNode
   footer: ReactNode
   floatBtn: ReactNode
-}
+}6
 
 export default async function RootLayout({ children, header, footer, floatBtn }: RootLayoutProps): Promise<ReactNode> {
   const cookieStore = await cookies()
@@ -33,7 +33,7 @@ export default async function RootLayout({ children, header, footer, floatBtn }:
   return (
     <ReactQueryProviders>
       <EdgeProvider sessionData={sessionData}>
-        <html lang="en">
+        <html lang="ja" suppressHydrationWarning>
           <body>
             <div className="wrap">
               {header}

src/app/pdf/page.tsx

@@ -0,0 +1,9 @@
+import DownloadPdf from '@/components/DownloadPDF'
+
+export default function page() {
+  return (
+    <>
+      <DownloadPdf />
+    </>
+  )
+}

src/app/suitable-test/layout.tsx

@@ -0,0 +1,24 @@
+import type { ReactNode } from 'react'
+
+interface SuitableLayoutProps {
+  children: ReactNode
+}
+
+export default function layout({ children }: SuitableLayoutProps) {
+  return (
+    <>
+      <div className="container">
+        <div className="sale-contents">
+          <div className="border-frame">
+            <div className="pw-guide">
+              <div className="pw-guide-txt">この適合表は参考資料として使用してください.</div>
+              <div className="pw-guide-txt">詳細やお問い合わせは1：1お問い合わせをご利用ください.</div>
+              <div className="pw-guide-txt">屋根材の選択or屋根材名を直接入力してください.</div>
+            </div>
+          </div>
+          {children}
+        </div>
+      </div>
+    </>
+  )
+}

src/app/suitable-test/page.tsx

@@ -0,0 +1,9 @@
+import SuitableRaw from '@/components/suitable/SuitableRaw'
+
+export default function page() {
+  return (
+    <>
+      <SuitableRaw />
+    </>
+  )
+}

src/app/survey-sale/[id]/page.tsx

@@ -1,11 +1,10 @@
 import DataTable from '@/components/survey-sale/detail/DataTable'
-import DetailForm from '@/components/survey-sale/detail/DetailForm'
 
 export default function page() {
   return (
     <>
       <DataTable />
-      <DetailForm />
+      {/* <DetailForm surveyInfo={surveyInfo} mode="READ" /> */}
     </>
   )
 }

src/app/survey-sale/basic-info/page.tsx

@@ -1,9 +0,0 @@
-import BasicForm from '@/components/survey-sale/detail/BasicForm'
-
-export default function page() {
-  return (
-    <>
-      <BasicForm />
-    </>
-  )
-}

src/app/survey-sale/layout.tsx

@@ -9,10 +9,7 @@ export default function layout({ children, navTab }: SurveySaleLayoutProps) {
   return (
     <>
       <div className="container">
-        <div className="sale-contents">
-          {navTab}
-          {children}
-        </div>
+        <div className="sale-contents">{children}</div>
       </div>
     </>
   )

src/app/survey-sale/page.tsx

@@ -1,10 +1,8 @@
 import ListTable from '@/components/survey-sale/list/ListTable'
-import SearchForm from '@/components/survey-sale/list/SearchForm'
 
 export default function page() {
   return (
     <>
-      <SearchForm />
       <ListTable />
     </>
   )

src/app/survey-sale/regist/page.tsx

@@ -0,0 +1,9 @@
+import RegistForm from '@/components/survey-sale/detail/RegistForm'
+
+export default function RegistPage() {
+  return (
+    <>
+      <RegistForm/>
+    </>
+  )
+}

src/app/survey-sale/roof-info/page.tsx

@@ -1,9 +0,0 @@
-import RoofInfoForm from '@/components/survey-sale/detail/RoofInfoForm'
-
-export default function page() {
-  return (
-    <>
-      <RoofInfoForm />
-    </>
-  )
-}

src/components/DownloadPDF.tsx

@@ -0,0 +1,748 @@
+'use client'
+
+import { useRef } from 'react'
+import generatePDF, { Margin, Resolution } from 'react-to-pdf'
+
+export default function DownloadPdf() {
+  const targetRef = useRef<HTMLDivElement>(null)
+  const handleDownPdf = () => {
+    const options = {
+      method: 'open' as const,
+      resolution: Resolution.HIGH,
+      page: {
+        margin: Margin.SMALL,
+        format: 'A4',
+        orientation: 'portrait' as const,
+      },
+      canvas: {
+        mimeType: 'image/png' as const,
+        qualityRatio: 1,
+      },
+      overrides: {
+        pdf: {
+          compress: true,
+        },
+        canvas: {
+          useCORS: true,
+        },
+      },
+    }
+
+    generatePDF(targetRef, options)
+    // generatePDF(targetRef, { filename: 'page.pdf' })
+  }
+  return (
+    <>
+      <button onClick={handleDownPdf}>down</button>
+      <div ref={targetRef} style={{ boxSizing: 'border-box' }}>
+        <div style={{ margin: '0 auto', padding: 0, maxWidth: '800px' }}>
+          <div style={{ padding: '20px 20px 50px', borderBottom: '2px solid #2E3A59' }}>
+            <div style={{ float: 'left', verticalAlign: 'middle', fontSize: '18px', color: '#101010', fontWeight: 600, fontFamily: 'M-Gothic' }}>
+              HWJ 現地調査シート1/2
+            </div>
+            <div style={{ float: 'right', overflow: 'hidden' }}>
+              <div style={{ float: 'left', marginRight: '20px' }}>
+                <p style={{ margin: 0, padding: 0, fontSize: '13px', color: '#101010', fontWeight: 500, fontFamily: 'M-Gothic', textAlign: 'right' }}>
+                  現地明登施工店名
+                </p>
+                <p style={{ margin: 0, padding: 0, fontSize: '13px', color: '#FF5656', fontWeight: 400, fontFamily: 'M-Gothic' }}>
+                  Sheet2 No.4Sheet2
+                </p>
+              </div>
+              <div style={{ float: 'right' }}>
+                <p style={{ margin: 0, padding: 0, fontSize: '13px', color: '#101010', fontWeight: 500, fontFamily: 'M-Gothic' }}>現地阴買日</p>
+                <p style={{ margin: 0, padding: 0, fontSize: '13px', color: '#FF5656', fontWeight: 400, fontFamily: 'M-Gothic' }}>2025.05.09</p>
+              </div>
+            </div>
+          </div>
+          <div style={{ padding: '24px 20px 12px' }}>
+            <table
+              style={{ width: '100%', tableLayout: 'fixed', borderCollapse: 'collapse', fontFamily: 'M-Gothic', WebkitPrintColorAdjust: 'exact' }}
+            >
+              <tbody>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '73px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    お客様名
+                  </th>
+                  <td
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    Sheet2No.1
+                  </td>
+                </tr>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '73px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    ご住所
+                  </th>
+                  <td
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    Sheet2No.2
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+          <div style={{ padding: '12px 20px 12px' }}>
+            <div style={{ fontSize: '14px', fontFamily: 'M-Gothic', color: '#101010', fontWeight: 500, marginBottom: '10px' }}>も気開係</div>
+            <table
+              style={{ width: '100%', tableLayout: 'fixed', borderCollapse: 'collapse', fontFamily: 'M-Gothic', WebkitPrintColorAdjust: 'exact' }}
+            >
+              <tbody>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    雨気契约容国
+                  </th>
+                  <td
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    Sheet2No.1
+                  </td>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    電気契約会社
+                  </th>
+                  <td
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    Sheet2No.1
+                  </td>
+                </tr>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    電気付带設備
+                  </th>
+                  <td
+                    colSpan={3}
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    Sheet2No.7 選式回答表示/自由入力回答表示
+                  </td>
+                </tr>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    設置希望システム
+                  </th>
+                  <td
+                    colSpan={3}
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    Sheet2No.8 選択式回表示/自由入力回表
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+          <div style={{ padding: '12px 20px 12px' }}>
+            <div style={{ fontSize: '14px', fontFamily: 'M-Gothic', color: '#101010', fontWeight: 500, marginBottom: '10px' }}>屋根眀係</div>
+            <table
+              style={{ width: '100%', tableLayout: 'fixed', borderCollapse: 'collapse', fontFamily: 'M-Gothic', WebkitPrintColorAdjust: 'exact' }}
+            >
+              <tbody>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    築年数
+                  </th>
+                  <td
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.9
+                  </td>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    至根材
+                  </th>
+                  <td
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.10
+                  </td>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    座根形状
+                  </th>
+                  <td
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.11
+                  </td>
+                </tr>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    座根勾配
+                  </th>
+                  <td
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.12
+                  </td>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    住宅樠造
+                  </th>
+                  <td
+                    colSpan={3}
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.13
+                  </td>
+                </tr>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    並木材質
+                  </th>
+                  <td
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.14
+                  </td>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    垂木サイズ
+                  </th>
+                  <td
+                    colSpan={3}
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.15
+                  </td>
+                </tr>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    垂木ビッチ
+                  </th>
+                  <td
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.16
+                  </td>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    垂木方向
+                  </th>
+                  <td
+                    colSpan={3}
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.17
+                  </td>
+                </tr>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    野地板種類
+                  </th>
+                  <td
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.18
+                  </td>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    野地板厚さ
+                  </th>
+                  <td
+                    colSpan={3}
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.19
+                  </td>
+                </tr>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    兩漏の形跡
+                  </th>
+                  <td
+                    colSpan={5}
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.20
+                  </td>
+                </tr>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    ルーフィング種類
+                  </th>
+                  <td
+                    colSpan={5}
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.21
+                  </td>
+                </tr>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    断熱材の有無
+                  </th>
+                  <td
+                    colSpan={5}
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.22
+                  </td>
+                </tr>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '126px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    屋根構造の順番
+                  </th>
+                  <td
+                    colSpan={5}
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.23
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+          <div style={{ padding: '12px 20px' }}>
+            <table
+              style={{ width: '100%', tableLayout: 'fixed', borderCollapse: 'collapse', fontFamily: 'M-Gothic', WebkitPrintColorAdjust: 'exact' }}
+            >
+              <tbody>
+                <tr>
+                  <th
+                    style={{
+                      padding: '10px',
+                      width: '160px',
+                      border: '1px solid #2E3A59',
+                      backgroundColor: '#F5F6FA',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#101010',
+                      textAlign: 'left',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    区根製品名設置可否確認
+                  </th>
+                  <td
+                    colSpan={5}
+                    style={{
+                      padding: '10px',
+                      border: '1px solid #2E3A59',
+                      fontSize: '13px',
+                      fontWeight: 500,
+                      color: '#FF5656',
+                      boxSizing: 'border-box',
+                    }}
+                  >
+                    No.23
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+          <div style={{ padding: '12px 20px 12px' }}>
+            <div style={{ fontSize: '14px', fontFamily: 'M-Gothic', color: '#101010', fontWeight: 500, marginBottom: '10px' }}>メモ</div>
+            <div
+              style={{
+                boxSizing: 'border-box',
+                padding: '10px',
+                fontSize: '13px',
+                fontWeight: 400,
+                fontFamily: 'M-Gothic',
+                color: '#FF5656',
+                border: '1px solid #2E3A59',
+                height: '150px',
+              }}
+            >
+              No.25
+            </div>
+          </div>
+        </div>
+      </div>
+    </>
+  )
+}

src/components/LoadMoreButton.tsx

@@ -0,0 +1,21 @@
+'use client'
+
+interface LoadMoreButtonProps {
+  hasMore: boolean
+  onLoadMore: () => void
+}
+
+export default function LoadMoreButton({ hasMore, onLoadMore }: LoadMoreButtonProps) {
+  return (
+    <>
+      {hasMore ? (
+        <button onClick={onLoadMore} className="btn-frame n-blue icon">
+          もっと見る
+          <i className="btn-edit"></i>
+        </button>
+      ) : (
+        <></>
+      )}
+    </>
+  )
+}

src/components/inquiry/ListForm.tsx

@@ -1,10 +1,13 @@
 'use client'
+import { useRouter } from 'next/navigation'
+
 export default function ListForm() {
+  const router = useRouter()
   return (
     <>
       <div className="sale-frame">
         <div className="sale-form-bx">
-          <button className="btn-frame n-blue icon">
+          <button className="btn-frame n-blue icon" onClick={() => router.push('/inquiry/regist')}>
             お問い合わせ<i className="btn-arr"></i>
           </button>
         </div>

src/components/inquiry/ListTable.tsx

@@ -1,5 +1,52 @@
 'use client'
+
+import { use, useEffect, useState } from 'react'
+import LoadMoreButton from '../LoadMoreButton'
+
+const inquiryDummy = [
+  { id: 1, category: '屋根', title: '屋根材適合性確認依頼', date: '2025.04.02', status: 'completed' },
+  { id: 2, category: '外壁', title: '外壁仕上げ材確認', date: '2025.04.03', status: 'completed' },
+  { id: 3, category: '設備', title: '換気システム図面確認', date: '2025.04.04', status: 'completed' },
+  { id: 4, category: '基礎', title: '基礎配筋検査依頼', date: '2025.04.05', status: 'completed' },
+  { id: 5, category: '内装', title: 'クロス仕様確認', date: '2025.04.06', status: 'waiting' },
+  { id: 6, category: '構造', title: '耐震壁位置変更申請', date: '2025.04.07', status: 'completed' },
+  { id: 7, category: '屋根', title: '雨樋取付方法確認', date: '2025.04.08', status: 'completed' },
+  { id: 8, category: '外構', title: 'フェンス高さ変更相談', date: '2025.04.09', status: 'completed' },
+  { id: 9, category: '設備', title: '給湯器設置位置確認', date: '2025.04.10', status: 'completed' },
+  { id: 10, category: '外壁', title: 'タイル割付案確認依頼', date: '2025.04.11', status: 'waiting' },
+  { id: 11, category: '内装', title: '照明配置図面確認', date: '2025.04.12', status: 'completed' },
+  { id: 12, category: '構造', title: '梁補強案確認', date: '2025.04.13', status: 'completed' },
+  { id: 13, category: '基礎', title: '杭長設計確認依頼', date: '2025.04.14', status: 'completed' },
+  { id: 14, category: '屋根', title: '断熱材施工方法確認', date: '2025.04.15', status: 'completed' },
+  { id: 15, category: '外構', title: '駐車場勾配図確認', date: '2025.04.16', status: 'completed' },
+]
+
+const badgeStyle = [
+  {
+    id: 'completed',
+    label: '回答完了',
+    color: 'blue',
+  },
+  {
+    id: 'waiting',
+    label: '回答待ち',
+    color: 'orange',
+  },
+]
 export default function ListTable() {
+  const [offset, setOffset] = useState(0)
+  const [hasMore, setHasMore] = useState(true)
+
+  const inquiryList = inquiryDummy.slice(0, offset + 10)
+
+  useEffect(() => {
+    if (inquiryDummy.length > offset + 10) {
+      setHasMore(true)
+    } else {
+      setHasMore(false)
+    }
+  }, [inquiryList])
+
   return (
     <>
       <div className="sale-frame">
@@ -13,10 +60,8 @@ export default function ListTable() {
           <div className="filter-select">
             <select className="select-form" name="" id="">
               <option value="">全体</option>
-              <option value="">全体</option>
-              <option value="">全体</option>
-              <option value="">全体</option>
-              <option value="">全体</option>
+              <option value="">回答待ち</option>
+              <option value="">回答完了</option>
             </select>
           </div>
         </div>
@@ -80,9 +125,7 @@ export default function ListTable() {
             </li>
           </ul>
           <div className="sale-edit-btn">
-            <button className="btn-frame n-blue icon">
-              もっと見る<i className="btn-edit"></i>
-            </button>
+            <LoadMoreButton hasMore={hasMore} onLoadMore={() => setOffset(offset + 10)} />
           </div>
         </div>
       </div>

src/components/popup/MemberInformationPopup.tsx

@@ -3,6 +3,7 @@
 import { useRouter } from 'next/navigation'
 import { usePopupController } from '@/store/popupController'
 import { useSessionStore } from '@/store/session'
+import Image from 'next/image'
 
 export default function MemberInformationPopup() {
   const popupController = usePopupController()
@@ -22,7 +23,7 @@ export default function MemberInformationPopup() {
             <div className="modal-header-inner">
               <div className="modal-name-wrap">
                 <div className="modal-img">
-                  <img src="/assets/images/layout/modal_header_icon.svg" alt="" />
+                  <Image src="/assets/images/layout/modal_header_icon.svg" width={18} height={20} alt="" />
                 </div>
                 <div className="modal-name">会員情報</div>
               </div>

src/components/popup/ZipCodePopup.tsx

@@ -1,18 +1,56 @@
 'use client'
 
+import { useServey } from '@/hooks/useSurvey'
+import { useAddressStore } from '@/store/addressStore'
 import { usePopupController } from '@/store/popupController'
 import { useState } from 'react'
 
+type Address = {
+  address1: string
+  address2: string
+  address3: string
+  kana1: string
+  kana2: string
+  kana3: string
+  prefcode: string
+  zipcode: string
+}
+
 export default function ZipCodePopup() {
   const [searchValue, setSearchValue] = useState('') //search 데이터 유무
+  const [selected, setSelected] = useState('')
+  const { setAddressData } = useAddressStore()
+  const { getZipCode } = useServey()
+  const [addressInfo, setAddressInfo] = useState<Address[] | null>([])
 
   //search 데이터 value 추가
+
+  const popupController = usePopupController()
+
+  const handleApply = () => {
+    console.log(addressInfo?.[0])
+    setAddressData({
+      post_code: addressInfo?.[0]?.zipcode || '',
+      address: addressInfo?.[0]?.address1 || '',
+      address_detail: addressInfo?.[0]?.address2 + ' ' + addressInfo?.[0]?.address3 || '',
+    })
+    popupController.setZipCodePopup(false)
+  }
+
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setSearchValue(e.target.value)
   }
 
-  const popupController = usePopupController()
-
+  const handleSearch = () => {
+    const addressData = getZipCode(searchValue)
+    addressData.then((address) => {
+      if (address) {
+        setAddressInfo(address)
+      } else {
+        setAddressInfo([])
+      }
+    })
+  }
   return (
     <>
       <div className="modal-popup">
@@ -33,10 +71,10 @@ export default function ZipCodePopup() {
               <div className="zip-code-search-wrap">
                 <div className="zip-code-search-input">
                   <div className="search-input">
-                    <input type="text" className="search-frame" value={searchValue} onChange={handleChange} placeholder="Search" />
+                    <input type="text" className="search-frame" value={searchValue} placeholder="Search" onChange={handleChange} />
                     {/*input에 데이터 있으면 삭제버튼 보임 */}
                     {searchValue && <button className="del-icon" onClick={() => setSearchValue('')}></button>}
-                    <button className="search-icon"></button>
+                    <button className="search-icon" onClick={handleSearch}></button>
                   </div>
                 </div>
                 <div className="zip-code-table-wrap">
@@ -50,31 +88,23 @@ export default function ZipCodePopup() {
                       </tr>
                     </thead>
                     <tbody>
-                      <tr>
-                        <td>東京都</td>
-                        <td>浜松</td>
-                        <td>浜松町</td>
-                      </tr>
-                      <tr>
-                        <td>東京都</td>
-                        <td>浜松</td>
-                        <td>浜松町</td>
-                      </tr>
-                      <tr>
-                        <td>東京都</td>
-                        <td>浜松</td>
-                        <td>浜松町</td>
+                      {addressInfo?.map((item, index) => (
+                        <tr key={`${item.zipcode}-${index}`} onClick={() => setSelected(item.zipcode)}>
+                          <td>{item.address1}</td>
+                          <td>{item.address2}</td>
+                          <td>{item.address3}</td>
                         </tr>
+                      ))}
                     </tbody>
                   </table>
                   <div className="btn-flex-wrap">
                     <div className="btn-bx">
-                      <button className="btn-frame red icon">
+                      <button className="btn-frame red icon" onClick={handleApply}>
                         住所の適用<i className="btn-arr"></i>
                       </button>
                     </div>
                     <div className="btn-bx">
-                      <button className="btn-frame n-blue icon">
+                      <button className="btn-frame n-blue icon" onClick={() => popupController.setZipCodePopup(false)}>
                         閉じる<i className="btn-arr"></i>
                       </button>
                     </div>

src/components/suitable/Suitable.tsx

@@ -48,8 +48,8 @@ export default function Suitable() {
         <select className="select-form" name="" id="" value={selectedCategory || ''} onChange={(e) => setSelectedCategory(e.target.value)}>
           <option value="">屋根材を選択してください.</option>
           {suitableCommCode.get(SUITABLE_HEAD_CODE.ROOF_MT_CD)?.map((category: CommCode, index: number) => (
-            <option key={index} value={category.CODE}>
-              {category.CODE_JP}
+            <option key={index} value={category.code}>
+              {category.codeJp}
             </option>
           ))}
         </select>

src/components/suitable/SuitableList.tsx

@@ -1,32 +1,90 @@
 'use client'
 
 import Image from 'next/image'
-import { useState } from 'react'
+import { useState, useEffect, useRef, useCallback, useMemo } from 'react'
 import SuitableButton from './SuitableButton'
 import SuitableNoData from './SuitableNoData'
 import { useSuitable } from '@/hooks/useSuitable'
 import { useSuitableStore } from '@/store/useSuitableStore'
 import { SUITABLE_HEAD_CODE, type SuitableMain, type SuitableDetail } from '@/types/Suitable'
 
-export default function SuitableList() {
-  const { toCodeName, suitableSearchResults, isSearchLoading, filterSuitableDetail } = useSuitable()
-  const { selectedItems, addSelectedItem, removeSelectedItem } = useSuitableStore()
-  const [openItems, setOpenItems] = useState<Set<number>>(new Set())
+// 한 번에 로드할 아이템 수
+const ITEMS_PER_PAGE = 100
 
-  const handleItemClick = (itemId: number) => {
-    selectedItems.some((selected) => selected === itemId) ? removeSelectedItem(itemId) : addSelectedItem(itemId)
+export default function SuitableList() {
+  const { toCodeName, suitableSearchResults, isSearchLoading, toSuitableDetail } = useSuitable()
+  const { selectedItems, addSelectedItem, removeSelectedItem } = useSuitableStore()
+
+  const [openItems, setOpenItems] = useState<Set<number>>(new Set())
+  const [visibleItems, setVisibleItems] = useState<SuitableMain[]>([])
+  const [page, setPage] = useState(1)
+  const [isLoadingMore, setIsLoadingMore] = useState(false)
+  const observerTarget = useRef<HTMLDivElement>(null)
+
+  // 선택된 아이템 확인 함수 메모이제이션
+  const isItemSelected = useCallback(
+    (itemId: number) => {
+      return selectedItems.some((selected) => selected === itemId)
+    },
+    [selectedItems],
+  )
+
+  // 초기 데이터 로드
+  useEffect(() => {
+    if (suitableSearchResults) {
+      const initialItems = suitableSearchResults.suitable.slice(0, ITEMS_PER_PAGE)
+      setVisibleItems(initialItems)
+      setPage(1)
+    }
+  }, [suitableSearchResults])
+
+  // Intersection Observer 설정
+  useEffect(() => {
+    const observer = new IntersectionObserver(
+      (entries) => {
+        if (entries[0].isIntersecting && suitableSearchResults && !isLoadingMore) {
+          const nextPage = page + 1
+          const startIndex = (nextPage - 1) * ITEMS_PER_PAGE
+          const endIndex = startIndex + ITEMS_PER_PAGE
+          const nextItems = suitableSearchResults.suitable.slice(startIndex, endIndex)
+
+          if (nextItems.length > 0) {
+            setIsLoadingMore(true)
+            setVisibleItems((prev) => [...prev, ...nextItems])
+            setPage(nextPage)
+            setIsLoadingMore(false)
+          }
+        }
+      },
+      {
+        threshold: 0.2,
+      },
+    )
+
+    if (observerTarget.current) {
+      observer.observe(observerTarget.current)
     }
 
-  const toggleItemOpen = (itemId: number) => {
+    return () => observer.disconnect()
+  }, [page, suitableSearchResults, isLoadingMore])
+
+  const handleItemClick = useCallback(
+    (itemId: number) => {
+      isItemSelected(itemId) ? removeSelectedItem(itemId) : addSelectedItem(itemId)
+    },
+    [isItemSelected, addSelectedItem, removeSelectedItem],
+  )
+
+  const toggleItemOpen = useCallback((itemId: number) => {
     setOpenItems((prev) => {
       const newOpenItems = new Set(prev)
       newOpenItems.has(itemId) ? newOpenItems.delete(itemId) : newOpenItems.add(itemId)
       return newOpenItems
     })
-  }
+  }, [])
 
   // TODO: 추후 지붕재 적합성 데이터 CUD 구현 시 ×, ー 데이터 관리 필요
-  const suitableCheck = (value: string) => {
+  const suitableCheck = useCallback((value: string) => {
     if (value === '×') {
       return (
         <div className="compliance-icon">
@@ -46,36 +104,36 @@ export default function SuitableList() {
         </div>
       )
     }
-  }
+  }, [])
+
+  // 메모이제이션된 아이템 렌더링
+  const renderItem = useCallback(
+    (item: SuitableMain) => {
+      const isSelected = isItemSelected(item.id)
+      const isOpen = openItems.has(item.id)
 
       return (
-    <>
-      {isSearchLoading ? (
-        <div>Loading...</div>
-      ) : suitableSearchResults && suitableSearchResults.suitable.length > 0 ? (
-        <>
-          {suitableSearchResults.suitable.map((item: SuitableMain) => (
-            <div className={`compliance-check-bx ${openItems.has(item.ID) ? 'act' : ''}`} key={item.ID}>
+        <div className={`compliance-check-bx ${isOpen ? 'act' : ''}`} key={item.id}>
           <div className="check-name-wrap">
             <div className="check-form-box ">
-                  <input type="checkbox" id={`ch${item.ID}`} onClick={() => handleItemClick(item.ID)} />
-                  <label htmlFor={`ch${item.ID}`}>{item.PRODUCT_NAME}</label>
+              <input type="checkbox" id={`ch${item.id}`} checked={isSelected} onChange={() => handleItemClick(item.id)} />
+              <label htmlFor={`ch${item.id}`}>{item.productName}</label>
             </div>
             <div className="check-name-btn">
-                  <button className="bx-btn" onClick={() => toggleItemOpen(item.ID)}></button>
+              <button className="bx-btn" onClick={() => toggleItemOpen(item.id)}></button>
             </div>
           </div>
           <ul className="reference-list check">
-                {filterSuitableDetail(item.ID)?.map((subItem: SuitableDetail) => (
-                  <li className="reference-item" key={subItem.ID}>
+            {toSuitableDetail(item.id).map((subItem: SuitableDetail) => (
+              <li className="reference-item" key={subItem.id}>
                 <div className="check-item-wrap">
                   <div className="check-form-box light">
-                        <input type="checkbox" id={`ch${subItem.ID}`} />
-                        <label htmlFor={`ch${subItem.ID}`}>{toCodeName(SUITABLE_HEAD_CODE.TRESTLE_MFPC_CD, subItem.TRESTLE_MFPC_CD)}</label>
+                    <input type="checkbox" id={`ch${subItem.id}`} />
+                    <label htmlFor={`ch${subItem.id}`}>{toCodeName(SUITABLE_HEAD_CODE.TRESTLE_MFPC_CD, subItem.trestleMfpcCd)}</label>
                   </div>
                   <div className="compliance-icon-wrap">
-                        {suitableCheck(subItem.TRESTLE_MANUFACTURER_PRODUCT_NAME)}
-                        {subItem.MEMO && (
+                    {suitableCheck(subItem.trestleManufacturerProductName)}
+                    {subItem.memo && (
                       <div className="compliance-icon">
                         <Image src={'/assets/images/sub/compliance_tip_icon.svg'} width={22} height={22} alt=""></Image>
                       </div>
@@ -86,12 +144,31 @@ export default function SuitableList() {
             ))}
           </ul>
         </div>
-          ))}
+      )
+    },
+    [isItemSelected, openItems, handleItemClick, toggleItemOpen, suitableCheck, toCodeName, toSuitableDetail],
+  )
+
+  // 메모이제이션된 아이템 리스트
+  const renderedItems = useMemo(() => {
+    return visibleItems.map(renderItem)
+  }, [visibleItems, renderItem])
+
+  if (isSearchLoading) {
+    return <div>Loading...</div>
+  }
+
+  if (!suitableSearchResults?.suitable.length) {
+    return <SuitableNoData />
+  }
+
+  return (
+    <>
+      {renderedItems}
+      <div ref={observerTarget} className="loading-indicator">
+        {isLoadingMore && <div className="loading-more">데이터를 불러오는 중...</div>}
+      </div>
       <SuitableButton />
     </>
-      ) : (
-        <SuitableNoData />
-      )}
-    </>
   )
 }

src/components/suitable/SuitableListRaw.tsx

@@ -0,0 +1,173 @@
+'use client'
+
+import Image from 'next/image'
+import { useState, useEffect, useRef, useCallback, useMemo } from 'react'
+import SuitableButton from './SuitableButton'
+import SuitableNoData from './SuitableNoData'
+import { useSuitableRaw, type Suitable } from '@/hooks/useSuitableRaw'
+import { useSuitableStore } from '@/store/useSuitableStore'
+import { SUITABLE_HEAD_CODE, type SuitableDetail } from '@/types/Suitable'
+
+// 한 번에 로드할 아이템 수
+const ITEMS_PER_PAGE = 100
+
+export default function SuitableListRaw() {
+  const { toCodeName, suitableSearchResults, isSearchLoading, toSuitableDetail } = useSuitableRaw()
+  const { selectedItems, addSelectedItem, removeSelectedItem } = useSuitableStore()
+  const [openItems, setOpenItems] = useState<Set<number>>(new Set())
+  const [visibleItems, setVisibleItems] = useState<Suitable[]>([])
+  const [page, setPage] = useState(1)
+  const [isLoadingMore, setIsLoadingMore] = useState(false)
+  const observerTarget = useRef<HTMLDivElement>(null)
+
+  // 선택된 아이템 확인 함수 메모이제이션
+  const isItemSelected = useCallback(
+    (itemId: number) => {
+      return selectedItems.some((selected) => selected === itemId)
+    },
+    [selectedItems],
+  )
+
+  // 초기 데이터 로드
+  useEffect(() => {
+    if (suitableSearchResults) {
+      const initialItems = suitableSearchResults.slice(0, ITEMS_PER_PAGE)
+      setVisibleItems(initialItems)
+      setPage(1)
+    }
+  }, [suitableSearchResults])
+
+  // Intersection Observer 설정
+  useEffect(() => {
+    const observer = new IntersectionObserver(
+      (entries) => {
+        if (entries[0].isIntersecting && suitableSearchResults && !isLoadingMore) {
+          const nextPage = page + 1
+          const startIndex = (nextPage - 1) * ITEMS_PER_PAGE
+          const endIndex = startIndex + ITEMS_PER_PAGE
+          const nextItems = suitableSearchResults.slice(startIndex, endIndex)
+
+          if (nextItems.length > 0) {
+            setIsLoadingMore(true)
+            setVisibleItems((prev) => [...prev, ...nextItems])
+            setPage(nextPage)
+            setIsLoadingMore(false)
+          }
+        }
+      },
+      {
+        threshold: 0.2,
+      },
+    )
+
+    if (observerTarget.current) {
+      observer.observe(observerTarget.current)
+    }
+
+    return () => observer.disconnect()
+  }, [page, suitableSearchResults, isLoadingMore])
+
+  const handleItemClick = useCallback(
+    (itemId: number) => {
+      isItemSelected(itemId) ? removeSelectedItem(itemId) : addSelectedItem(itemId)
+    },
+    [isItemSelected, addSelectedItem, removeSelectedItem],
+  )
+
+  const toggleItemOpen = useCallback((itemId: number) => {
+    setOpenItems((prev) => {
+      const newOpenItems = new Set(prev)
+      newOpenItems.has(itemId) ? newOpenItems.delete(itemId) : newOpenItems.add(itemId)
+      return newOpenItems
+    })
+  }, [])
+
+  // TODO: 추후 지붕재 적합성 데이터 CUD 구현 시 ×, ー 데이터 관리 필요
+  const suitableCheck = useCallback((value: string) => {
+    if (value === '×') {
+      return (
+        <div className="compliance-icon">
+          <Image src={'/assets/images/sub/compliance_x_icon.svg'} width={22} height={22} alt=""></Image>
+        </div>
+      )
+    } else if (value === 'ー') {
+      return (
+        <div className="compliance-icon">
+          <Image src={'/assets/images/sub/compliance_quest_icon.svg'} width={22} height={22} alt=""></Image>
+        </div>
+      )
+    } else {
+      return (
+        <div className="compliance-icon">
+          <Image src={'/assets/images/sub/compliance_check_icon.svg'} width={22} height={22} alt=""></Image>
+        </div>
+      )
+    }
+  }, [])
+
+  // 메모이제이션된 아이템 렌더링
+  const renderItem = useCallback(
+    (item: Suitable) => {
+      const isSelected = isItemSelected(item.id)
+      const isOpen = openItems.has(item.id)
+
+      return (
+        <div className={`compliance-check-bx ${isOpen ? 'act' : ''}`} key={item.id}>
+          <div className="check-name-wrap">
+            <div className="check-form-box ">
+              <input type="checkbox" id={`ch${item.id}`} checked={isSelected} onChange={() => handleItemClick(item.id)} />
+              <label htmlFor={`ch${item.id}`}>{item.productName}</label>
+            </div>
+            <div className="check-name-btn">
+              <button className="bx-btn" onClick={() => toggleItemOpen(item.id)}></button>
+            </div>
+          </div>
+          <ul className="reference-list check">
+            {toSuitableDetail(item.detail).map((subItem: SuitableDetail) => (
+              <li className="reference-item" key={subItem.id}>
+                <div className="check-item-wrap">
+                  <div className="check-form-box light">
+                    <input type="checkbox" id={`ch${subItem.id}`} />
+                    <label htmlFor={`ch${subItem.id}`}>{toCodeName(SUITABLE_HEAD_CODE.TRESTLE_MFPC_CD, subItem.trestleMfpcCd)}</label>
+                  </div>
+                  <div className="compliance-icon-wrap">
+                    {suitableCheck(subItem.trestleManufacturerProductName)}
+                    {subItem.memo && (
+                      <div className="compliance-icon">
+                        <Image src={'/assets/images/sub/compliance_tip_icon.svg'} width={22} height={22} alt=""></Image>
+                      </div>
+                    )}
+                  </div>
+                </div>
+              </li>
+            ))}
+          </ul>
+        </div>
+      )
+    },
+    [isItemSelected, openItems, handleItemClick, toggleItemOpen, suitableCheck, toCodeName, toSuitableDetail],
+  )
+
+  // 메모이제이션된 아이템 리스트
+  const renderedItems = useMemo(() => {
+    return visibleItems.map(renderItem)
+  }, [visibleItems, renderItem])
+
+  if (isSearchLoading) {
+    return <div>Loading...</div>
+  }
+
+  if (!suitableSearchResults?.length) {
+    return <SuitableNoData />
+  }
+
+  return (
+    <>
+      {renderedItems}
+      <div ref={observerTarget} className="loading-indicator">
+        {isLoadingMore && <div className="loading-more">데이터를 불러오는 중...</div>}
+      </div>
+      <SuitableButton />
+    </>
+  )
+}

src/components/suitable/SuitableRaw.tsx

@@ -0,0 +1,118 @@
+'use client'
+
+import Image from 'next/image'
+import { useEffect, useState } from 'react'
+import SuitableListRaw from './SuitableListRaw'
+import { useSuitableRaw } from '@/hooks/useSuitableRaw'
+import { useSuitableStore } from '@/store/useSuitableStore'
+import type { CommCode } from '@/types/CommCode'
+import { SUITABLE_HEAD_CODE } from '@/types/Suitable'
+
+export default function SuitableRaw() {
+  const [reference, setReference] = useState(true)
+
+  const { getSuitableCommCode, refetchBySearch } = useSuitableRaw()
+  const { suitableCommCode, selectedCategory, setSelectedCategory, searchValue, setSearchValue, setIsSearch, clearSelectedItems } = useSuitableStore()
+
+  const handleInputSearch = async () => {
+    if (!searchValue.trim()) {
+      alert('屋根材の製品名を入力してください。')
+      return
+    }
+    setIsSearch(true)
+    refetchBySearch()
+  }
+
+  const handleInputClear = () => {
+    setSearchValue('')
+    setIsSearch(false)
+    refetchBySearch()
+  }
+
+  useEffect(() => {
+    refetchBySearch()
+  }, [selectedCategory])
+
+  useEffect(() => {
+    getSuitableCommCode()
+    return () => {
+      setSelectedCategory('')
+      setSearchValue('')
+      clearSelectedItems()
+    }
+  }, [])
+
+  return (
+    <div className="border-frame">
+      <span>테스트1 페이지</span>
+      <div className="sale-form-bx">
+        <select className="select-form" name="" id="" value={selectedCategory || ''} onChange={(e) => setSelectedCategory(e.target.value)}>
+          <option value="">屋根材を選択してください.</option>
+          {suitableCommCode.get(SUITABLE_HEAD_CODE.ROOF_MT_CD)?.map((category: CommCode, index: number) => (
+            <option key={index} value={category.code}>
+              {category.codeJp}
+            </option>
+          ))}
+        </select>
+      </div>
+      <div className="sale-form-bx">
+        <div className="search-input">
+          <input
+            type="text"
+            className="search-frame"
+            placeholder="屋根材 製品名を入力してください."
+            value={searchValue}
+            onChange={(e) => setSearchValue(e.target.value)}
+          />
+          {searchValue && <button className="del-icon" onClick={handleInputClear} />}
+          <button className="search-icon" onClick={handleInputSearch} />
+        </div>
+      </div>
+      <div className="compliance-check-wrap">
+        <div className={`compliance-check-bx ${reference ? 'act' : ''}`}>
+          <div className="check-name-wrap">
+            <div className="check-name">凡例</div>
+            <div className="check-name-btn">
+              <button className="bx-btn" onClick={() => setReference(!reference)}></button>
+            </div>
+          </div>
+          <ul className="reference-list">
+            <li className="reference-item">
+              <div className="reference-item-bx">
+                <div className="compliance-icon">
+                  <Image src={'/assets/images/sub/compliance_check_icon.svg'} width={22} height={22} alt=""></Image>
+                </div>
+                <span>設置可能</span>
+              </div>
+            </li>
+            <li className="reference-item">
+              <div className="reference-item-bx">
+                <div className="compliance-icon">
+                  <Image src={'/assets/images/sub/compliance_x_icon.svg'} width={22} height={22} alt=""></Image>
+                </div>
+                <span>設置不可</span>
+              </div>
+            </li>
+            <li className="reference-item">
+              <div className="reference-item-bx">
+                <div className="compliance-icon">
+                  <Image src={'/assets/images/sub/compliance_quest_icon.svg'} width={22} height={22} alt=""></Image>
+                </div>
+                <span>お問い合わせ</span>
+              </div>
+            </li>
+            <li className="reference-item">
+              <div className="reference-item-bx">
+                <div className="compliance-icon">
+                  <Image src={'/assets/images/sub/compliance_tip_icon.svg'} width={22} height={22} alt=""></Image>
+                </div>
+                <span>備考</span>
+              </div>
+            </li>
+          </ul>
+        </div>
+        <SuitableListRaw />
+      </div>
+    </div>
+  )
+}

src/components/survey-sale/common/NavTab.tsx

@@ -1,31 +1,74 @@
 'use client'
 
 import { useSurveySaleTabState } from '@/store/surveySaleTabState'
-import { usePathname, useRouter } from 'next/navigation'
+import { usePathname, useRouter, useSearchParams, useParams } from 'next/navigation'
 import { useEffect } from 'react'
 
 export default function NavTab() {
   const router = useRouter()
   const pathname = usePathname()
 
-  if (pathname === '/survey-sale') {
-    return null
-  }
+  const searchParams = useSearchParams()
+  const id = searchParams.get('id')
+  const isTemp = searchParams.get('isTemp')
 
-  const { basicInfoSelected, roofInfoSelected, reset } = useSurveySaleTabState()
+  const params = useParams()
+  const detailId = params.id
+
+  const { basicInfoSelected, roofInfoSelected, reset, setBasicInfoSelected, setRoofInfoSelected } = useSurveySaleTabState()
 
   useEffect(() => {
     return () => {
       reset()
     }
-  }, [])
+  }, [reset])
+
+  if (pathname === '/survey-sale') {
+    return null
+  }
+
+  const scrollSection = (section: string) => {
+    const sectionElement = document.getElementById(section)
+    if (sectionElement) {
+      sectionElement.scrollIntoView({ behavior: 'smooth' })
+    }
+  }
 
   const handleBasicInfoClick = () => {
-    router.push('/survey-sale/basic-info')
+    // if (id) {
+    //   router.push(`/survey-sale/basic-info?id=${id}`)
+    //   return
+    // }
+    if (detailId) {
+      router.push(`/survey-sale/${detailId}`)
+      return
+    }
+    scrollSection('basic-form-section')
+
+    setBasicInfoSelected()
   }
 
   const handleRoofInfoClick = () => {
-    router.push('/survey-sale/roof-info')
+    // if (id) {
+    //   if (isTemp === 'true') {
+    //     alert('基本情報が一時保存された状態です。')
+    //     return
+    //   }
+    //   router.push(`/survey-sale/roof-info?id=${id}`)
+    //   return
+    // }
+    if (detailId) {
+      router.push(`/survey-sale/${detailId}?tab=roof-info`)
+      return
+    }
+    if (pathname === '/survey-sale/basic-info') {
+      alert('基本情報を先に保存してください。')
+      return null
+    }
+    // if (pathname === '/survey-sale/regist') {
+    scrollSection('roof-form-section')
+    // }
+    setRoofInfoSelected()
   }
 
   return (

src/components/survey-sale/detail/BasicForm.tsx

@@ -1,10 +1,14 @@
 'use client'
 
-import { useEffect } from 'react'
+import { useEffect, useState } from 'react'
 import { useSurveySaleTabState } from '@/store/surveySaleTabState'
+import { SurveyBasicRequest } from '@/types/Survey'
+import { Mode } from 'fs'
 
-export default function BasicForm() {
+export default function BasicForm(props: { basicInfo: SurveyBasicRequest; setBasicInfo: (basicInfo: SurveyBasicRequest) => void; mode: Mode }) {
+  const { basicInfo, setBasicInfo, mode } = props
   const { setBasicInfoSelected } = useSurveySaleTabState()
+  const [isFlip, setIsFlip] = useState<boolean>(true)
 
   useEffect(() => {
     setBasicInfoSelected()
@@ -12,84 +16,98 @@ export default function BasicForm() {
 
   return (
     <>
+      <div className={`sale-detail-toggle-bx ${isFlip ? 'act' : ''}`}>
+        <div className="sale-detail-toggle-head" onClick={() => setIsFlip(!isFlip)}>
+          <div className="sale-detail-toggle-name">基本情報</div>
+          <div className="sale-detail-toggle-btn-wrap">
+            <button className="sale-detail-toggle-btn"></button>
+          </div>
+        </div>
+        <div className="sale-detail-toggle-cont">
           <div className="sale-frame">
             <div className="data-form-wrap">
               <div className="data-input-form-bx">
                 <div className="data-input-form-tit">担当者名</div>
-            <input type="text" className="input-frame" defaultValue={'HG'} />
+                <input
+                  type="text"
+                  className="input-frame"
+                  readOnly={mode === 'READ'}
+                  value={basicInfo?.representative ?? ''}
+                  onChange={(e) => setBasicInfo({ ...basicInfo, representative: e.target.value })}
+                />
               </div>
               <div className="data-input-form-bx">
                 <div className="data-input-form-tit">販売店</div>
-            <input type="text" className="input-frame" defaultValue={'HWJ(T01)'} />
+                <input
+                  type="text"
+                  className="input-frame"
+                  readOnly={mode === 'READ'}
+                  value={basicInfo?.store ?? ''}
+                  onChange={(e) => setBasicInfo({ ...basicInfo, store: e.target.value })}
+                />
               </div>
               <div className="data-input-form-bx">
                 <div className="data-input-form-tit">施工店</div>
-            <input type="text" className="input-frame" defaultValue={'施工点名表示'} />
+                <input
+                  type="text"
+                  className="input-frame"
+                  readOnly={mode === 'READ'}
+                  value={basicInfo?.constructionPoint ?? ''}
+                  onChange={(e) => setBasicInfo({ ...basicInfo, constructionPoint: e.target.value })}
+                />
               </div>
             </div>
           </div>
-
           <div className="sale-frame">
             <div className="data-form-wrap">
               <div className="data-input-form-bx">
                 <div className="data-input-form-tit">現地調査日</div>
+                {['CREATE', 'EDIT'].includes(mode as 'CREATE' | 'EDIT') ? (
                   <div className="date-input">
                     <button className="date-btn">
                       <i className="date-icon"></i>
                     </button>
-              <input type="text" className="date-frame" defaultValue={'2025.04.16'} />
+                    <input type="date" className="date-frame" readOnly defaultValue={basicInfo?.investigationDate?.toString()} />
                   </div>
+                ) : (
+                  <input type="date" className="input-frame" disabled defaultValue={basicInfo?.investigationDate?.toString()} />
+                )}
               </div>
               <div className="data-input-form-bx">
+                {/* 건물명 */}
                 <div className="data-input-form-tit">建物名</div>
-            <input type="text" className="input-frame" defaultValue={'ギルドン'} />
+                <input type="text" className="input-frame" readOnly={mode === 'READ'} defaultValue={basicInfo?.buildingName ?? ''} />
               </div>
               <div className="data-input-form-bx">
+                {/* 고객명 */}
                 <div className="data-input-form-tit">建物名</div>
-            <input type="text" className="input-frame" defaultValue={'HWJ Building'} />
+                <input type="text" className="input-frame" readOnly={mode === 'READ'} defaultValue={basicInfo?.customerName ?? ''} />
               </div>
               <div className="data-input-form-bx">
-            <div className="data-input-form-tit">建物名</div>
+                <div className="data-input-form-tit">郵便番号/都道府県</div>
                 <div className="form-flex">
+                  {/* 우편번호 */}
                   <div className="form-bx">
-                <input type="text" className="input-frame" defaultValue={'1050013'} disabled />
+                    <input type="text" className="input-frame" readOnly={mode === 'READ'} defaultValue={basicInfo?.postCode ?? ''} disabled />
                   </div>
+                  {/* 도도부현 */}
                   <div className="form-bx">
-                <select className="select-form" name="" id="">
-                  <option value="">東京都</option>
-                  <option value="">東京都</option>
-                  <option value="">東京都</option>
-                  <option value="">東京都</option>
-                  <option value="">東京都</option>
-                </select>
+                    <input type="text" className="input-frame" readOnly={mode === 'READ'} defaultValue={basicInfo?.address ?? ''} disabled />
                   </div>
                 </div>
+                {/* 주소 */}
                 <div className="form-btn">
                   <button className="btn-frame n-blue icon">
                     郵便番号<i className="btn-arr"></i>
                   </button>
                 </div>
               </div>
+
               <div className="data-input-form-bx">
                 <div className="data-input-form-tit">市区町村名, 以後の住所</div>
-            <input type="text" className="input-frame" defaultValue={'浜松 浜松町'} />
+                <input type="text" className="input-frame" defaultValue={'浜松 浜松町'} readOnly={mode === 'READ'} />
               </div>
             </div>
-        <div className="btn-flex-wrap">
-          <div className="btn-bx">
-            <button className="btn-frame n-blue icon">
-              一時保存<i className="btn-arr"></i>
-            </button>
-          </div>
-          <div className="btn-bx">
-            <button className="btn-frame red icon">
-              保存<i className="btn-arr"></i>
-            </button>
-          </div>
-          <div className="btn-bx">
-            <button className="btn-frame n-blue icon">
-              リスト<i className="btn-arr"></i>
-            </button>
           </div>
         </div>
       </div>

src/components/survey-sale/detail/ButtonForm.tsx

@@ -0,0 +1,81 @@
+import { Mode, SurveyBasicRequest, SurveyDetailRequest } from '@/types/Survey'
+
+export default function ButtonForm(props: { mode: Mode; setMode: (mode: Mode) => void; data: { basic: SurveyBasicRequest; roof: SurveyDetailRequest } }) {
+  const { mode, setMode } = props
+  return (
+    <>
+      {mode === 'CREATE' && (
+        <div className="sale-form-btn-wrap">
+          <div className="btn-flex-wrap">
+            <div className="btn-bx">
+              {/* 임시저장 */}
+              <button className="btn-frame n-blue icon" onClick={() => setMode('TEMP')}>
+                一時保存<i className="btn-arr"></i>
+              </button>
+            </div>
+            <div className="btn-bx">
+              {/* 저장 */}
+              <button className="btn-frame red icon">
+                保存<i className="btn-arr"></i>
+              </button>
+            </div>
+            <div className="btn-bx">
+              {/* 목록 */}
+              <button className="btn-frame n-blue icon">
+                リスト<i className="btn-arr"></i>
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+      {mode === 'TEMP' && (
+        <div className="sale-form-btn-wrap">
+          <div className="btn-flex-wrap">
+            <div className="btn-bx">
+              {/* 수정 */}
+              <button className="btn-frame n-blue icon" onClick={() => setMode('EDIT')}>
+                修正<i className="btn-arr"></i>
+              </button>
+            </div>
+            <div className="btn-bx">
+              {/* 삭제 */}
+              <button className="btn-frame n-blue icon">
+                削除<i className="btn-arr"></i>
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+      {mode === 'EDIT' && (
+        <div className="sale-form-btn-wrap">
+          <div className="btn-flex-wrap">
+            <div className="btn-bx">
+              {/* 목록 */}
+              <button className="btn-frame n-blue icon">
+                リスト<i className="btn-arr"></i>
+              </button>
+            </div>
+            <div className="btn-bx">
+              {/* 제출 */}
+              <button className="btn-frame red icon">
+                提出<i className="btn-arr"></i>
+              </button>
+            </div>
+            <div className="btn-bx">
+              {/* 수정 */}
+              <button className="btn-frame n-blue icon" onClick={() => setMode('EDIT')}>
+                修正<i className="btn-arr"></i>
+              </button>
+            </div>
+            <div className="btn-bx">
+              {/* 삭제 */}
+              <button className="btn-frame n-blue icon">
+                削除<i className="btn-arr"></i>
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </>
+  )
+}

src/components/survey-sale/detail/DataTable.tsx

@@ -1,9 +1,39 @@
 'use client'
 
+import { useServey } from '@/hooks/useSurvey'
+import { useParams, useSearchParams } from 'next/navigation'
+import { useEffect, useState } from 'react'
+import DetailForm from './DetailForm'
+import { SurveyBasicInfo } from '@/types/Survey'
+
 export default function DataTable() {
+  const params = useParams()
+  const id = params.id
+
+  const searchParams = useSearchParams()
+  const isTemp = searchParams.get('isTemporary')
+
+  const { surveyDetail, isLoadingSurveyDetail } = useServey(Number(id))
+  const [isTemporary, setIsTemporary] = useState(isTemp === 'true')
+
+  const { validateSurveyDetail } = useServey(Number(id))
+
+  useEffect(() => {
+    if (surveyDetail?.detailInfo) {
+      const validate = validateSurveyDetail(surveyDetail.detailInfo)
+      if (validate.trim() !== '') {
+        setIsTemporary(false)
+      }
+    }
+  }, [surveyDetail])
+
+  if (isLoadingSurveyDetail) {
+    return <div>Loading...</div>
+  }
+
   return (
     <>
-      <div className="sale-frame">
+      <div className="sale-data-table-wrap">
         <table className="sale-data-table">
           <colgroup>
             <col style={{ width: '80px' }} />
@@ -12,19 +42,35 @@ export default function DataTable() {
           <tbody>
             <tr>
               <th>登録番号</th>
-              <td>0000000020</td>
+              {isTemporary ? (
+                <td>
+                  <span className="text-red-500">仮保存</span>
+                </td>
+              ) : (
+                <td>{surveyDetail?.id}</td>
+              )}
             </tr>
             <tr>
               <th>登録日</th>
-              <td>2025.04.11</td>
+              <td>{surveyDetail?.regDt ? new Date(surveyDetail.regDt).toLocaleString() : ''}</td>
             </tr>
             <tr>
               <th>更新日時</th>
-              <td>2025.04.11 15:06:29</td>
+              <td>{surveyDetail?.uptDt ? new Date(surveyDetail.uptDt).toLocaleString() : ''}</td>
             </tr>
             <tr>
               <th>提出可否</th>
-              <td>2025.04.12 10:00:00 (INTERPLUG –販売店)</td>
+              <td>
+                {surveyDetail?.submissionStatus && surveyDetail?.submissionDate ? (
+                  <>
+                    {/* TODO: 제출한 판매점 ID 추가 필요 */}
+                    <div>{new Date(surveyDetail.submissionDate).toLocaleString()}</div>
+                    <div>{surveyDetail.store}</div>
+                  </>
+                ) : (
+                  '-'
+                )}
+              </td>
             </tr>
             <tr>
               <th>ダウンロード</th>
@@ -37,6 +83,7 @@ export default function DataTable() {
           </tbody>
         </table>
       </div>
+      <DetailForm surveyInfo={surveyDetail as SurveyBasicInfo} mode="READ" />
     </>
   )
 }

src/components/survey-sale/detail/DetailForm.tsx

@@ -1,62 +1,93 @@
 'use client'
 
-export default function DetailForm() {
+import { Mode, SurveyBasicInfo, SurveyBasicRequest, SurveyDetailRequest } from '@/types/Survey'
+import { useEffect, useState } from 'react'
+import ButtonForm from './ButtonForm'
+import BasicForm from './BasicForm'
+import RoofForm from './RoofForm'
+const roofInfoForm: SurveyDetailRequest = {
+  contractCapacity: null,
+  retailCompany: null,
+  supplementaryFacilities: null,
+  supplementaryFacilitiesEtc: null,
+  installationSystem: null,
+  installationSystemEtc: null,
+  constructionYear: null,
+  constructionYearEtc: null,
+  roofMaterial: null,
+  roofMaterialEtc: null,
+  roofShape: null,
+  roofShapeEtc: null,
+  roofSlope: null,
+  houseStructure: '1',
+  houseStructureEtc: null,
+  rafterMaterial: '1',
+  rafterMaterialEtc: null,
+  rafterSize: null,
+  rafterSizeEtc: null,
+  rafterPitch: null,
+  rafterPitchEtc: null,
+  rafterDirection: '1',
+  openFieldPlateKind: null,
+  openFieldPlateKindEtc: null,
+  openFieldPlateThickness: null,
+  leakTrace: false,
+  waterproofMaterial: null,
+  waterproofMaterialEtc: null,
+  insulationPresence: '1',
+  insulationPresenceEtc: null,
+  structureOrder: null,
+  structureOrderEtc: null,
+  installationAvailability: null,
+  installationAvailabilityEtc: null,
+  memo: null,
+}
+
+const basicInfoForm: SurveyBasicRequest = {
+  representative: '',
+  store: null,
+  constructionPoint: null,
+  investigationDate: new Date().toLocaleDateString('en-CA'),
+  buildingName: null,
+  customerName: null,
+  postCode: null,
+  address: null,
+  addressDetail: null,
+  submissionStatus: false,
+  submissionDate: null,
+}
+
+export default function DetailForm(props: { surveyInfo?: SurveyBasicInfo; mode?: Mode }) {
+  const [mode, setMode] = useState<Mode>(props.mode ?? 'CREATE')
+  const [basicInfoData, setBasicInfoData] = useState<SurveyBasicRequest>(basicInfoForm)
+  const [roofInfoData, setRoofInfoData] = useState<SurveyDetailRequest>(roofInfoForm)
+
+  useEffect(() => {
+    if (props.surveyInfo && (mode === 'EDIT' || mode === 'READ')) {
+      const { id, uptDt, regDt, detailInfo, ...rest } = props.surveyInfo
+      setBasicInfoData(rest)
+      if (detailInfo) {
+        const { id, uptDt, regDt, basicInfoId, ...rest } = detailInfo
+        setRoofInfoData(rest)
+      }
+    }
+  }, [props.surveyInfo, mode])
+
+  const data = {
+    basic: basicInfoData,
+    roof: roofInfoData,
+  }
+
+  const buttonFormProps = { mode, setMode, data }
+
   return (
     <>
-      <div className="sale-frame">
-        <div className="data-form-wrap">
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">担当者名</div>
-            <input type="text" className="input-frame" disabled defaultValue={'HG'} />
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">販売店</div>
-            <input type="text" className="input-frame" disabled defaultValue={'HWJ(T01)'} />
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">施工店</div>
-            <input type="text" className="input-frame" disabled defaultValue={'施工点名表示'} />
-          </div>
-        </div>
-      </div>
-
-      <div className="sale-frame">
-        <div className="data-form-wrap">
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">現地調査日</div>
-            <input type="text" className="input-frame" disabled defaultValue={'2025/04/05'} />
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">建物名</div>
-            <input type="text" className="input-frame" disabled defaultValue={'ハンファジャパンビル'} />
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">顧客名</div>
-            <input type="text" className="input-frame" disabled defaultValue={'Hong gi'} />
-          </div>
-        </div>
-        <div className="btn-flex-wrap">
-          <div className="btn-bx">
-            <button className="btn-frame n-blue icon">
-              リスト<i className="btn-arr"></i>
-            </button>
-          </div>
-          <div className="btn-bx">
-            <button className="btn-frame red icon">
-              提出<i className="btn-arr"></i>
-            </button>
-          </div>
-          <div className="btn-bx">
-            <button className="btn-frame n-blue icon">
-              修正<i className="btn-arr"></i>
-            </button>
-          </div>
-          <div className="btn-bx">
-            <button className="btn-frame n-blue icon">
-              削除<i className="btn-arr"></i>
-            </button>
-          </div>
-        </div>
+      <div className="sale-detail-toggle-wrap">
+        {/* 기본정보 */}
+        <BasicForm basicInfo={basicInfoData} setBasicInfo={setBasicInfoData} mode={mode} />
+        {/* 전기/지붕정보 */}
+        <RoofForm roofInfo={roofInfoData} setRoofInfo={setRoofInfoData} mode={mode} />
+        <ButtonForm {...buttonFormProps} />
       </div>
     </>
   )

src/components/survey-sale/detail/RegistForm.tsx

@@ -0,0 +1,29 @@
+import { Mode } from '@/types/Survey'
+import { useSearchParams } from 'next/navigation'
+import DetailForm from './DetailForm'
+import { useServey } from '@/hooks/useSurvey'
+import { useEffect, useState } from 'react'
+import { SurveyBasicInfo } from '@/types/Survey'
+import { useSessionStore } from '@/store/session'
+
+export default function RegistForm() {
+  const searchParams = useSearchParams()
+  const id = searchParams.get('id')
+
+  const { surveyDetail } = useServey(Number(id))
+  const { session } = useSessionStore()
+
+  const [mode, setMode] = useState<Mode>('CREATE')
+
+  useEffect(() => {
+    if (id) {
+      setMode('EDIT')
+    }
+  }, [id])
+
+  return (
+    <>
+      <DetailForm mode={mode} surveyInfo={surveyDetail as SurveyBasicInfo} />
+    </>
+  )
+}

src/components/survey-sale/detail/RoofForm.tsx

@@ -0,0 +1,528 @@
+import { useState } from 'react'
+import { Mode, SurveyDetailInfo, SurveyDetailRequest } from '@/types/Survey'
+
+type RadioEtcKeys = 'houseStructure' | 'rafterMaterial' | 'waterproofMaterial' | 'insulationPresence' | 'rafterDirection' | 'leakTrace'
+type SelectBoxKeys =
+  | 'installationSystem'
+  | 'constructionYear'
+  | 'roofShape'
+  | 'rafterPitch'
+  | 'rafterSize'
+  | 'openFieldPlateKind'
+  | 'structureOrder'
+  | 'installationAvailability'
+
+export const supplementary_facilities = [
+  { id: 1, name: 'エコキュート' }, //에코큐트
+  { id: 2, name: 'エネパーム' }, //에네팜
+  { id: 3, name: '蓄電池システム' }, //축전지시스템
+  { id: 4, name: '太陽光発電' }, //태양광발전
+]
+
+export const roof_material = [
+  { id: 1, name: 'スレート' }, //슬레이트
+  { id: 2, name: 'アスファルトシングル' }, //아스팔트 싱글
+  { id: 3, name: '瓦' }, //기와
+  { id: 4, name: '金属屋根' }, //금속지붕
+]
+
+export const selectBoxOptions: Record<SelectBoxKeys, { id: number; name: string }[]> = {
+  installationSystem: [
+    {
+      id: 1,
+      name: '太陽光発電', //태양광발전
+    },
+    {
+      id: 2,
+      name: 'ハイブリッド蓄電システム', //하이브리드축전지시스템
+    },
+    {
+      id: 3,
+      name: '蓄電池システム', //축전지시스템
+    },
+  ],
+  constructionYear: [
+    {
+      id: 1,
+      name: '新築', //신축
+    },
+    {
+      id: 2,
+      name: '既築', //기존
+    },
+  ],
+  roofShape: [
+    {
+      id: 1,
+      name: '切妻', //박공지붕
+    },
+    {
+      id: 2,
+      name: '寄棟', //기동
+    },
+    {
+      id: 3,
+      name: '片流れ', //한쪽흐름
+    },
+  ],
+  rafterSize: [
+    {
+      id: 1,
+      name: '幅35mm以上×高さ48mm以上',
+    },
+    {
+      id: 2,
+      name: '幅36mm以上×高さ46mm以上',
+    },
+    {
+      id: 3,
+      name: '幅37mm以上×高さ43mm以上',
+    },
+    {
+      id: 4,
+      name: '幅38mm以上×高さ40mm以上',
+    },
+  ],
+  rafterPitch: [
+    {
+      id: 1,
+      name: '455mm以下',
+    },
+    {
+      id: 2,
+      name: '500mm以下',
+    },
+    {
+      id: 3,
+      name: '606mm以下',
+    },
+  ],
+  openFieldPlateKind: [
+    {
+      id: 1,
+      name: '構造用合板', //구조용합판
+    },
+    {
+      id: 2,
+      name: 'OSB', //OSB
+    },
+    {
+      id: 3,
+      name: 'パーティクルボード', //파티클보드
+    },
+    {
+      id: 4,
+      name: '小幅板', //소판
+    },
+  ],
+  structureOrder: [
+    {
+      id: 1,
+      name: '屋根材', //지붕재
+    },
+    {
+      id: 2,
+      name: '防水材', //방수재
+    },
+    {
+      id: 3,
+      name: '屋根の基礎', //지붕의기초
+    },
+    {
+      id: 4,
+      name: '垂木', //서까래
+    },
+  ],
+  installationAvailability: [
+    {
+      id: 1,
+      name: '確認済み', //확인완료
+    },
+    {
+      id: 2,
+      name: '未確認', //미확인
+    },
+  ],
+}
+
+export const radioEtcData: Record<RadioEtcKeys, { id: number; label: string }[]> = {
+  houseStructure: [
+    {
+      id: 1,
+      label: '木製',
+    },
+  ],
+  rafterMaterial: [
+    {
+      id: 1,
+      label: '木製',
+    },
+    {
+      id: 2,
+      label: '強制',
+    },
+  ],
+  waterproofMaterial: [
+    {
+      id: 1,
+      label: 'アスファルト屋根940（22kg以上）',
+    },
+  ],
+  insulationPresence: [
+    {
+      id: 1,
+      label: 'なし',
+    },
+    {
+      id: 2,
+      label: 'あり',
+    },
+  ],
+  rafterDirection: [
+    {
+      id: 1,
+      label: '垂直垂木',
+    },
+    {
+      id: 2,
+      label: '水平垂木',
+    },
+  ],
+  leakTrace: [
+    {
+      id: 1,
+      label: 'あり',
+    },
+    {
+      id: 2,
+      label: 'なし',
+    },
+  ],
+}
+
+export default function RoofForm(props: {
+  roofInfo: SurveyDetailRequest | SurveyDetailInfo
+  setRoofInfo: (roofInfo: SurveyDetailRequest) => void
+  mode: Mode
+}) {
+  const makeNumArr = (value: string) => {
+    return value
+      .split(',')
+      .map((v) => v.trim())
+      .filter((v) => v.length > 0)
+  }
+  const { roofInfo, setRoofInfo, mode } = props
+  const [isFlip, setIsFlip] = useState<boolean>(true)
+  return (
+    <div className={`sale-detail-toggle-bx ${isFlip ? 'act' : ''}`}>
+      <div className="sale-detail-toggle-head" onClick={() => setIsFlip(!isFlip)}>
+        <div className="sale-detail-toggle-name">電気 / 屋根情報</div>
+        <div className="sale-detail-toggle-btn-wrap">
+          <button className="sale-detail-toggle-btn"></button>
+        </div>
+      </div>
+      <div className="sale-detail-toggle-cont">
+        <div className="sale-frame">
+          {/* 전기 관계 */}
+          <div className="sale-roof-title">電気関係</div>
+          <div className="data-form-wrap">
+            <div className="data-input-form-bx">
+              {/* 전기 계약 용량 */}
+              <div className="data-input-form-tit">電気契約容量</div>
+              <div className="data-input mb5">
+                <input type="text" className="input-frame" value={roofInfo?.contractCapacity ?? ''} readOnly={mode === 'READ'} />
+              </div>
+              {mode === 'READ' && <input type="text" className="input-frame" defaultValue={'10'} readOnly={mode === 'READ'} />}
+              {mode !== 'READ' && (
+                <div className="data-input">
+                  <select className="select-form" name="" id="">
+                    <option value="">kVA</option>
+                    <option value="">kVA</option>
+                    <option value="">kVA</option>
+                    <option value="">kVA</option>
+                    <option value="">kVA</option>
+                  </select>
+                </div>
+              )}
+            </div>
+            <div className="data-input-form-bx">
+              {/* 전기 소매 회사사 */}
+              <div className="data-input-form-tit">電気小売会社</div>
+              <input type="text" className="input-frame" value={roofInfo?.retailCompany ?? ''} readOnly={mode === 'READ'} />
+            </div>
+            <div className="data-input-form-bx">
+              {/* 전기 부대 설비 */}
+              <div className="data-input-form-tit">
+                電気袋設備<span>※複数選択可能</span>
+              </div>
+              <div className="data-check-wrap">
+                {/* <div className="check-form-box">
+                  <input type="checkbox" id="ch01" readOnly={mode === 'READ'} />
+                  <label htmlFor="ch01">エコキュート</label>
+                </div> */}
+                {supplementary_facilities.map((item) => (
+                  <div className="check-form-box" key={item.id}>
+                    <input
+                      type="checkbox"
+                      id={`${item.id}`}
+                      checked={makeNumArr(roofInfo?.supplementaryFacilities ?? '').includes(String(item.id))}
+                      readOnly={mode === 'READ'}
+                    />
+                    <label htmlFor={`${item.id}`}>{item.name}</label>
+                  </div>
+                ))}
+                <div className="check-form-box">
+                  <input type="checkbox" id={`supplementaryFacilitiesEtc`} checked={roofInfo?.supplementaryFacilitiesEtc !== null} readOnly />
+                  <label htmlFor={`supplementaryFacilitiesEtc`}>その他 (直接入力)</label>
+                </div>
+              </div>
+              <div className="data-input">
+                <input type="text" className="input-frame" placeholder="-" readOnly value={roofInfo?.supplementaryFacilitiesEtc ?? ''} />
+              </div>
+            </div>
+            <div className="data-input-form-bx">
+              {/* 설치 희망 시스템 */}
+              {/* <div className="data-input-form-tit red-f">設置希望システム</div>
+              {mode === 'READ' && (
+                <div className="data-input">
+                  <input type="text" className="input-frame" defaultValue={''} disabled />
+                </div>
+              )}
+              {mode !== 'READ' && (
+                <div className="data-input mb5">
+                  <select className="select-form" name="" id="">
+                    <option value="">太陽光発電</option>
+                    <option value="">太陽光発電</option>
+                    <option value="">太陽光発電</option>
+                    <option value="">太陽光発電</option>
+                    <option value="">太陽光発電</option>
+                  </select>
+                </div>
+              )} */}
+              <div className="data-input-form-tit">設置希望システム</div>
+              <SelectedBox column="installationSystem" detailInfoData={roofInfo as SurveyDetailInfo} />
+            </div>
+          </div>
+        </div>
+        <div className="sale-frame">
+          {/* 지붕 관계 */}
+          <div className="sale-roof-title">屋根関係</div>
+          <div className="data-form-wrap">
+            <div className="data-input-form-bx">
+              {/* 건축 연수 */}
+              <div className="data-input-form-tit red-f">建築研修</div>
+              <div className="data-input mb5">
+                {/* {mode === 'READ' && <input type="text" className="input-frame" defaultValue={''} disabled />}
+                {mode !== 'READ' && (
+                  <select className="select-form" name="" id="">
+                    <option value="">新築</option>
+                    <option value="">新築</option>
+                    <option value="">新築</option>
+                    <option value="">新築</option>
+                    <option value="">新築</option>
+                  </select>
+                )} */}
+                <SelectedBox column="constructionYear" detailInfoData={roofInfo as SurveyDetailInfo} />
+              </div>
+              {/* <div className="data-input flex">
+                <input type="text" className="input-frame" defaultValue={''} disabled />
+                <span>年</span>
+              </div> */}
+            </div>
+            <div className="data-input-form-bx">
+              {/* 지붕재 */}
+              <div className="data-input-form-tit">
+                屋根材<span>※最大2個まで選択可能</span>
+              </div>
+              <div className="data-check-wrap">
+                {roof_material.map((item) => (
+                  <div className="check-form-box" key={item.id}>
+                    <input type="checkbox" id={`${item.id}`} checked={makeNumArr(roofInfo?.roofMaterial ?? '').includes(String(item.id))} readOnly />
+                    <label htmlFor={`${item.id}`}>{item.name}</label>
+                  </div>
+                ))}
+                <div className="check-form-box">
+                  <input type="checkbox" id={`roofMaterialEtc`} checked={roofInfo?.roofMaterialEtc !== null} readOnly />
+                  <label htmlFor={`roofMaterialEtc`}>その他 (直接入力)</label>
+                </div>
+              </div>
+              <div className="data-input">
+                <input type="text" className="input-frame" placeholder="-" readOnly value={roofInfo?.roofMaterialEtc ?? ''} />
+              </div>
+            </div>
+            <div className="data-input-form-bx">
+              {/* 지붕 모양 */}
+              <div className="data-input-form-tit">建築研修</div>
+              <div className="data-input mb5">
+                {/* {mode === 'READ' && <input type="text" className="input-frame" defaultValue={''} disabled />}
+                {mode !== 'READ' && (
+                  <select className="select-form" name="" id="">
+                    <option value="">太陽光発電</option>
+                    <option value="">太陽光発電</option>
+                    <option value="">太陽光発電</option>
+                    <option value="">太陽光発電</option>
+                    <option value="">太陽光発電</option>
+                  </select>
+                )} */}
+                <SelectedBox column="roofShape" detailInfoData={roofInfo as SurveyDetailInfo} />
+              </div>
+              <div className="data-input">
+                <input type="text" className="input-frame" defaultValue={''} disabled />
+              </div>
+            </div>
+            <div className="data-input-form-bx">
+              {/* 지붕 경사도도 */}
+              <div className="data-input-form-tit">屋根の斜面</div>
+              <div className="data-input flex">
+                <input type="text" className="input-frame" value={roofInfo?.roofSlope ?? ''} readOnly={mode === 'READ'} />
+                <span>寸</span>
+              </div>
+            </div>
+            <div className="data-input-form-bx">
+              {/* 주택구조조 */}
+              <div className="data-input-form-tit">住宅構造</div>
+              <RadioSelected column="houseStructure" detailInfoData={roofInfo as SurveyDetailInfo} />
+            </div>
+            <div className="data-input-form-bx">
+              {/* 서까래 재질 */}
+              <div className="data-input-form-tit">垂木材質</div>
+              <RadioSelected column="rafterMaterial" detailInfoData={roofInfo as SurveyDetailInfo} />
+            </div>
+            <div className="data-input-form-bx">
+              {/* 서까래 크기 */}
+              <div className="data-input-form-tit red-f">垂木サイズ</div>
+              <div className="data-input mb5">
+                <SelectedBox column="rafterSize" detailInfoData={roofInfo as SurveyDetailInfo} />
+              </div>
+            </div>
+            <div className="data-input-form-bx">
+              {/* 서까래 피치 */}
+              <div className="data-input-form-tit red-f">垂木サイズ</div>
+              <div className="data-input mb5">
+                <SelectedBox column="rafterPitch" detailInfoData={roofInfo as SurveyDetailInfo} />
+              </div>
+            </div>
+            <div className="data-input-form-bx">
+              {/* 서까래 방향 */}
+              <div className="data-input-form-tit red-f">垂木の方向</div>
+              <div className="data-check-wrap mb0">
+                <RadioSelected column="rafterDirection" detailInfoData={roofInfo as SurveyDetailInfo} />
+              </div>
+            </div>
+            <div className="data-input-form-bx">
+              {/* 노지판 종류류 */}
+              <div className="data-input-form-tit">路地板の種類</div>
+              <div className="data-input mb5">
+                <SelectedBox column="openFieldPlateKind" detailInfoData={roofInfo as SurveyDetailInfo} />
+              </div>
+            </div>
+            <div className="data-input-form-bx">
+              {/* 노지판 두께 */}
+              <div className="data-input-form-tit">
+                路地板厚<span>※小幅板を選択した場合, 厚さ. 小幅板間の間隔寸法を記載</span>
+              </div>
+              <div className="data-input flex">
+                <input type="text" className="input-frame" value={roofInfo?.openFieldPlateThickness ?? ''} readOnly={mode === 'READ'} />
+                <span>mm</span>
+              </div>
+            </div>
+            <div className="data-input-form-bx">
+              {/* 누수 흔적 */}
+              <div className="data-input-form-tit ">水漏れの痕跡</div>
+              <div className="data-check-wrap mb0">
+                <RadioSelected column="leakTrace" detailInfoData={roofInfo as SurveyDetailInfo} />
+              </div>
+            </div>
+            <div className="data-input-form-bx">
+              {/* 방수재 종류 */}
+              <div className="data-input-form-tit red-f">防水材の種類</div>
+              <RadioSelected column="waterproofMaterial" detailInfoData={roofInfo as SurveyDetailInfo} />
+            </div>
+            <div className="data-input-form-bx">
+              {/* 단열재 유무 */}
+              <div className="data-input-form-tit red-f">断熱材の有無</div>
+              <RadioSelected column="insulationPresence" detailInfoData={roofInfo as SurveyDetailInfo} />
+            </div>
+            <div className="data-input-form-bx">
+              {/* 지붕 구조의 순서 */}
+              <div className="data-input-form-tit red-f">屋根構造の順序</div>
+              <SelectedBox column="structureOrder" detailInfoData={roofInfo as SurveyDetailInfo} />
+            </div>
+            <div className="data-input-form-bx">
+              {/* 지붕 제품명 설치 가능 여부 확인 */}
+              <div className="data-input-form-tit">屋根製品名 設置可否確認</div>
+              <SelectedBox column="installationAvailability" detailInfoData={roofInfo as SurveyDetailInfo} />
+            </div>
+            <div className="data-input-form-bx">
+              {/* 메모 */}
+              <div className="data-input-form-tit">メモ</div>
+              <div className="data-input">
+                <textarea
+                  className="textarea-form"
+                  name=""
+                  id=""
+                  placeholder="TextArea Filed"
+                  value={roofInfo?.memo ?? ''}
+                  readOnly={mode === 'READ'}
+                ></textarea>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+const SelectedBox = ({ column, detailInfoData }: { column: string; detailInfoData: SurveyDetailInfo }) => {
+  const selectedId = detailInfoData?.[column as keyof SurveyDetailInfo]
+  const etcValue = detailInfoData?.[`${column}Etc` as keyof SurveyDetailInfo]
+
+  return (
+    <>
+      <select className="select-form mb10" name={column} id={column} disabled value={selectedId ? 'selected' : etcValue ? 'etc' : ''}>
+        <option value="">-</option>
+        <option value="etc">その他 (直接入力)</option>
+        <option value="selected">{selectBoxOptions[column as keyof typeof selectBoxOptions][Number(selectedId)]?.name}</option>
+      </select>
+      {etcValue && <input type="text" className="input-frame" readOnly value={etcValue.toString()} />}
+    </>
+  )
+}
+
+const RadioSelected = ({ column, detailInfoData }: { column: string; detailInfoData: SurveyDetailInfo | null }) => {
+  let selectedId = detailInfoData?.[column as keyof SurveyDetailInfo]
+  if (column === 'leakTrace') {
+    selectedId = Number(selectedId)
+    if (!selectedId) selectedId = 2
+  }
+
+  let etcValue = null
+  if (column !== 'rafterDirection') {
+    etcValue = detailInfoData?.[`${column}Etc` as keyof SurveyDetailInfo]
+  }
+  const etcChecked = etcValue !== null && etcValue !== undefined && etcValue !== ''
+
+  // console.log('column: selectedId', column, selectedId)
+  return (
+    <>
+      {radioEtcData[column as keyof typeof radioEtcData].map((item) => (
+        <div className="radio-form-box mb10" key={item.id}>
+          <input type="radio" name={column} id={`${item.id}`} disabled checked={Number(selectedId) === item.id} />
+          <label htmlFor={`${item.id}`}>{item.label}</label>
+        </div>
+      ))}
+      {column !== 'rafterDirection' && column !== 'leakTrace' && column !== 'insulationPresence' && (
+        <div className="radio-form-box mb10">
+          <input type="radio" name={column} id={`${column}Etc`} value="etc" disabled checked={etcChecked} />
+          <label htmlFor={`${column}Etc`}>その他 (直接入力)</label>
+        </div>
+      )}
+      {etcChecked && (
+        <div className="data-input">
+          <input type="text" className="input-frame" placeholder="-" readOnly value={etcValue?.toString() ?? ''} />
+        </div>
+      )}
+    </>
+  )
+}

src/components/survey-sale/detail/RoofInfoForm.tsx

@@ -1,370 +0,0 @@
-'use client'
-
-import { useEffect } from 'react'
-import { useSurveySaleTabState } from '@/store/surveySaleTabState'
-
-export default function RoofInfoForm() {
-  const { setRoofInfoSelected } = useSurveySaleTabState()
-
-  useEffect(() => {
-    setRoofInfoSelected()
-  }, [])
-
-  return (
-    <>
-      <div className="sale-frame">
-        <div className="sale-roof-title">電気関係</div>
-        <div className="data-form-wrap">
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">電気契約容量</div>
-            <div className="data-input mb5">
-              <input type="text" className="input-frame" defaultValue={'10'} />
-            </div>
-            <div className="data-input">
-              <select className="select-form" name="" id="">
-                <option value="">kVA</option>
-                <option value="">kVA</option>
-                <option value="">kVA</option>
-                <option value="">kVA</option>
-                <option value="">kVA</option>
-              </select>
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">電気小売会社</div>
-            <input type="text" className="input-frame" defaultValue={'HWJ Electric'} />
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">
-              電気袋設備<span>※複数選択可能</span>
-            </div>
-            <div className="data-check-wrap">
-              <div className="check-form-box">
-                <input type="checkbox" id="ch01" />
-                <label htmlFor="ch01">エコキュート</label>
-              </div>
-              <div className="check-form-box">
-                <input type="checkbox" id="ch02" />
-                <label htmlFor="ch02">エネパーム</label>
-              </div>
-              <div className="check-form-box">
-                <input type="checkbox" id="ch03" />
-                <label htmlFor="ch03">蓄電池システム</label>
-              </div>
-              <div className="check-form-box">
-                <input type="checkbox" id="ch04" />
-                <label htmlFor="ch04">太陽光発電</label>
-              </div>
-              <div className="check-form-box">
-                <input type="checkbox" id="ch05" />
-                <label htmlFor="ch05">その他 (直接入力)</label>
-              </div>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" disabled defaultValue={''} />
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit red-f">設置希望システム</div>
-            <div className="data-input mb5">
-              <select className="select-form" name="" id="">
-                <option value="">太陽光発電</option>
-                <option value="">太陽光発電</option>
-                <option value="">太陽光発電</option>
-                <option value="">太陽光発電</option>
-                <option value="">太陽光発電</option>
-              </select>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" defaultValue={''} disabled />
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div className="sale-frame">
-        <div className="sale-roof-title">屋根関係</div>
-        <div className="data-form-wrap">
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit red-f">建築研修</div>
-            <div className="data-input mb5">
-              <select className="select-form" name="" id="">
-                <option value="">新築</option>
-                <option value="">新築</option>
-                <option value="">新築</option>
-                <option value="">新築</option>
-                <option value="">新築</option>
-              </select>
-            </div>
-            <div className="data-input flex">
-              <input type="text" className="input-frame" defaultValue={''} disabled />
-              <span>年</span>
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">
-              屋根材<span>※最大2個まで選択可能</span>
-            </div>
-            <div className="data-check-wrap">
-              <div className="check-form-box">
-                <input type="checkbox" id="ch01" />
-                <label htmlFor="ch01">スレート</label>
-              </div>
-              <div className="check-form-box">
-                <input type="checkbox" id="ch02" />
-                <label htmlFor="ch02">アスファルトシングル</label>
-              </div>
-              <div className="check-form-box">
-                <input type="checkbox" id="ch03" />
-                <label htmlFor="ch03">瓦</label>
-              </div>
-              <div className="check-form-box">
-                <input type="checkbox" id="ch04" />
-                <label htmlFor="ch04">金属屋根</label>
-              </div>
-              <div className="check-form-box">
-                <input type="checkbox" id="ch05" />
-                <label htmlFor="ch05">その他 (直接入力)</label>
-              </div>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" disabled defaultValue={''} />
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">建築研修</div>
-            <div className="data-input mb5">
-              <select className="select-form" name="" id="">
-                <option value="">太陽光発電</option>
-                <option value="">太陽光発電</option>
-                <option value="">太陽光発電</option>
-                <option value="">太陽光発電</option>
-                <option value="">太陽光発電</option>
-              </select>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" defaultValue={''} disabled />
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">屋根の斜面</div>
-            <div className="data-input flex">
-              <input type="text" className="input-frame" defaultValue={'4'} />
-              <span>寸</span>
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">住宅構造</div>
-            <div className="radio-form-box mb10">
-              <input type="radio" name="radio01" id="ra01" />
-              <label htmlFor="ra01">木製</label>
-            </div>
-            <div className="radio-form-box mb10">
-              <input type="radio" name="radio01" id="ra02" />
-              <label htmlFor="ra02">その他 (直接入力)</label>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" disabled defaultValue={''} />
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">垂木材質</div>
-            <div className="data-check-wrap">
-              <div className="radio-form-box">
-                <input type="radio" name="radio02" id="ra03" />
-                <label htmlFor="ra03">木製</label>
-              </div>
-              <div className="radio-form-box">
-                <input type="radio" name="radio02" id="ra04" />
-                <label htmlFor="ra04">強制</label>
-              </div>
-              <div className="radio-form-box">
-                <input type="radio" name="radio02" id="ra05" />
-                <label htmlFor="ra05">その他 (直接入力)</label>
-              </div>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" disabled defaultValue={''} />
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit red-f">垂木サイズ</div>
-            <div className="data-input mb5">
-              <select className="select-form" name="" id="">
-                <option value="">幅35mm以上×高さ48mm以上</option>
-                <option value="">幅35mm以上×高さ48mm以上</option>
-                <option value="">幅35mm以上×高さ48mm以上</option>
-                <option value="">幅35mm以上×高さ48mm以上</option>
-                <option value="">幅35mm以上×高さ48mm以上</option>
-              </select>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" defaultValue={''} disabled />
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit red-f">垂木サイズ</div>
-            <div className="data-input mb5">
-              <select className="select-form" name="" id="">
-                <option value="">455mm以下</option>
-                <option value="">455mm以下</option>
-                <option value="">455mm以下</option>
-                <option value="">455mm以下</option>
-                <option value="">455mm以下</option>
-              </select>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" defaultValue={''} disabled />
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit red-f">垂木の方向</div>
-            <div className="data-check-wrap mb0">
-              <div className="radio-form-box">
-                <input type="radio" name="radio03" id="ra06" />
-                <label htmlFor="ra06">垂直垂木</label>
-              </div>
-              <div className="radio-form-box">
-                <input type="radio" name="radio03" id="ra07" />
-                <label htmlFor="ra07">水平垂木</label>
-              </div>
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">路地板の種類</div>
-            <div className="data-input mb5">
-              <select className="select-form" name="" id="">
-                <option value="">構造用合板</option>
-                <option value="">構造用合板</option>
-                <option value="">構造用合板</option>
-                <option value="">構造用合板</option>
-                <option value="">構造用合板</option>
-              </select>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" defaultValue={''} disabled />
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">
-              路地板厚<span>※小幅板を選択した場合, 厚さ. 小幅板間の間隔寸法を記載</span>
-            </div>
-            <div className="data-input flex">
-              <input type="text" className="input-frame" defaultValue={'150'} />
-              <span>mm</span>
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit ">垂木の方向</div>
-            <div className="data-check-wrap mb0">
-              <div className="radio-form-box">
-                <input type="radio" name="radio04" id="ra08" />
-                <label htmlFor="ra08">あり</label>
-              </div>
-              <div className="radio-form-box">
-                <input type="radio" name="radio04" id="ra09" />
-                <label htmlFor="ra09">なし</label>
-              </div>
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit red-f">住宅構造</div>
-            <div className="radio-form-box mb10">
-              <input type="radio" name="radio05" id="ra10" />
-              <label htmlFor="ra10">アスファルト屋根940（22kg以上）</label>
-            </div>
-            <div className="radio-form-box mb10">
-              <input type="radio" name="radio05" id="ra11" />
-              <label htmlFor="ra11">その他 (直接入力)</label>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" disabled defaultValue={''} />
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit red-f">断熱材の有無</div>
-            <div className="radio-form-box mb10">
-              <input type="radio" name="radio06" id="ra12" />
-              <label htmlFor="ra12">あり</label>
-            </div>
-            <div className="data-input mb10">
-              <input type="text" className="input-frame" defaultValue={''} />
-            </div>
-            <div className="radio-form-box">
-              <input type="radio" name="radio06" id="ra13" />
-              <label htmlFor="ra13">なし</label>
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit red-f">路地板の種類</div>
-            <div className="data-input mb5">
-              <select className="select-form" name="" id="">
-                <option value="">材/防水材/屋根基礎/垂木</option>
-                <option value="">材/防水材/屋根基礎/垂木</option>
-                <option value="">材/防水材/屋根基礎/垂木</option>
-                <option value="">材/防水材/屋根基礎/垂木</option>
-                <option value="">材/防水材/屋根基礎/垂木</option>
-              </select>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" defaultValue={''} disabled />
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">屋根製品名 設置可否確認</div>
-            <div className="data-input mb5">
-              <select className="select-form" name="" id="">
-                <option value="">確認済み</option>
-                <option value="">確認済み</option>
-                <option value="">確認済み</option>
-                <option value="">確認済み</option>
-                <option value="">確認済み</option>
-              </select>
-            </div>
-            <div className="data-input">
-              <input type="text" className="input-frame" defaultValue={'高島'} />
-            </div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">メモ</div>
-            <div className="data-input mb5">
-              <select className="select-form" name="" id="">
-                <option value="">確認済み</option>
-                <option value="">確認済み</option>
-                <option value="">確認済み</option>
-                <option value="">確認済み</option>
-                <option value="">確認済み</option>
-              </select>
-            </div>
-            <div className="data-input">
-              <textarea
-                className="textarea-form"
-                name=""
-                id=""
-                defaultValue={'漏れの兆候があるため、正確な点検が必要です.'}
-                placeholder="TextArea Filed"
-              ></textarea>
-            </div>
-          </div>
-        </div>
-        <div className="btn-flex-wrap">
-          <div className="btn-bx">
-            <button className="btn-frame n-blue icon">
-              一時保存<i className="btn-arr"></i>
-            </button>
-          </div>
-          <div className="btn-bx">
-            <button className="btn-frame red icon">
-              保存<i className="btn-arr"></i>
-            </button>
-          </div>
-          <div className="btn-bx">
-            <button className="btn-frame n-blue icon">
-              リスト<i className="btn-arr"></i>
-            </button>
-          </div>
-        </div>
-      </div>
-    </>
-  )
-}

src/components/survey-sale/list/ListTable.tsx

@@ -1,33 +1,82 @@
 'use client'
 
+import LoadMoreButton from '@/components/LoadMoreButton'
+import { useServey } from '@/hooks/useSurvey'
+import { useEffect, useState } from 'react'
+import { useRouter } from 'next/navigation'
+import SearchForm from './SearchForm'
+import { useSurveyFilterStore } from '@/store/surveyFilterStore'
+import { useSessionStore } from '@/store/session'
+import { SurveyBasicInfo } from '@/types/Survey'
+
 export default function ListTable() {
+  const router = useRouter()
+  const { surveyList, isLoadingSurveyList } = useServey()
+  const { offset, setOffset } = useSurveyFilterStore()
+
+  const [heldSurveyList, setHeldSurveyList] = useState<SurveyBasicInfo[]>([])
+  const [hasMore, setHasMore] = useState(false)
+
+  const { session } = useSessionStore()
+
+  useEffect(() => {
+    if (!session.isLoggedIn || !('data' in surveyList)) return
+    if ('count' in surveyList && surveyList.count > 0) {
+      if (offset > 0) {
+        setHeldSurveyList((prev) => [...prev, ...surveyList.data])
+      } else {
+        setHeldSurveyList(surveyList.data)
+      }
+      setHasMore(surveyList.count > offset + 10)
+    } else {
+      setHeldSurveyList([])
+      setHasMore(false)
+    }
+  }, [surveyList, offset, session])
+
+  const handleDetailClick = (id: number) => {
+    router.push(`/survey-sale/${id}`)
+  }
+
+  const handleItemsInit = () => {
+    setHeldSurveyList([])
+    setOffset(0)
+  }
+
+  // TODO: 로딩 처리 필요
+
   return (
     <>
+      <SearchForm memberRole={session?.role ?? ''} userId={session?.userId ?? ''} />
+      {heldSurveyList.length > 0 ? (
         <div className="sale-frame">
           <ul className="sale-list-wrap">
-          {Array.from({ length: 4 }).map((_, idx) => (
-            <li className="sale-list-item" key={idx}>
+            {heldSurveyList.map((survey) => (
+              <li className="sale-list-item cursor-pointer" key={survey.id} onClick={() => handleDetailClick(survey.id)}>
                 <div className="sale-item-bx">
                   <div className="sale-item-date-bx">
-                  <div className="sale-item-num">0000000021</div>
-                  <div className="sale-item-date">2025.04.22</div>
+                    <div className="sale-item-num">{survey.id}</div>
+                    <div className="sale-item-date">{survey.investigationDate}</div>
                   </div>
-                <div className="sale-item-tit">Hanwha Building</div>
-                <div className="sale-item-customer">Gil dong</div>
+                  <div className="sale-item-tit">{survey.buildingName}</div>
+                  <div className="sale-item-customer">{survey.customerName}</div>
                   <div className="sale-item-update-bx">
-                  <div className="sale-item-name">Hong Gildong</div>
-                  <div className="sale-item-update">2025.04.22 10:00:21</div>
+                    <div className="sale-item-name">{survey.representative}</div>
+                    <div className="sale-item-update">{new Date(survey.uptDt).toLocaleString()}</div>
                   </div>
                 </div>
               </li>
             ))}
           </ul>
           <div className="sale-edit-btn">
-          <button className="btn-frame n-blue icon">
-            もっと見る<i className="btn-edit"></i>
-          </button>
+            <LoadMoreButton hasMore={hasMore} onLoadMore={() => setOffset(offset + 10)} />
           </div>
         </div>
+      ) : (
+        <div>
+          <p>作成された物件はありません。</p>
+        </div>
+      )}
     </>
   )
 }

src/components/survey-sale/list/SearchForm.tsx

@@ -1,41 +1,104 @@
 'use client'
 
-export default function SearchForm() {
+import { SEARCH_OPTIONS, SEARCH_OPTIONS_ENUM, SEARCH_OPTIONS_PARTNERS, useSurveyFilterStore } from '@/store/surveyFilterStore'
+import { useRouter } from 'next/navigation'
+import { useState } from 'react'
+
+export default function SearchForm({ memberRole, userId }: { memberRole: string; userId: string }) {
+  const router = useRouter()
+  const { setSearchOption, setSort, setIsMySurvey, setKeyword, isMySurvey, keyword, searchOption, sort } = useSurveyFilterStore()
+  const [searchKeyword, setSearchKeyword] = useState(keyword)
+  const [option, setOption] = useState(searchOption)
+
+  const handleSearch = () => {
+    if (option !== 'id' && searchKeyword.trim().length < 2) {
+      alert('2文字以上入力してください')
+      return
+    }
+    setKeyword(searchKeyword)
+    setSearchOption(option)
+    // onItemsInit()
+  }
+  const searchOptions = memberRole === 'Partner' ? SEARCH_OPTIONS_PARTNERS : SEARCH_OPTIONS
+
   return (
     <div className="sale-frame">
       <div className="sale-form-bx">
-        <button className="btn-frame n-blue icon">
+        <button className="btn-frame n-blue icon" onClick={() => router.push('/survey-sale/regist')}>
           新規売買登録<i className="btn-arr"></i>
         </button>
       </div>
       <div className="sale-form-bx">
-        <select className="select-form" name="" id="">
-          <option value="">全体</option>
-          <option value="">全体</option>
-          <option value="">全体</option>
-          <option value="">全体</option>
-          <option value="">全体</option>
+        <select
+          className="select-form"
+          name="search-option"
+          id="search-option"
+          value={option}
+          onChange={(e) => {
+            if (e.target.value === 'all') {
+              setKeyword('')
+              setSearchKeyword('')
+              // onItemsInit()
+              setSearchOption('all')
+              setOption('all')
+            } else {
+              setOption(e.target.value as SEARCH_OPTIONS_ENUM)
+            }
+          }}
+        >
+          {searchOptions.map((option) => (
+            <option key={option.id} value={option.id}>
+              {option.label}
+            </option>
+          ))}
         </select>
       </div>
       <div className="sale-form-bx">
         <div className="search-input">
-          <input type="text" className="search-frame" placeholder="タイトルを入力してください. (2文字以上)" />
-          <button className="search-icon"></button>
+          <input
+            type="text"
+            className="search-frame"
+            value={searchKeyword}
+            placeholder="タイトルを入力してください. (2文字以上)"
+            onChange={(e) => {
+              setSearchKeyword(e.target.value)
+            }}
+            onKeyDown={(e) => {
+              if (e.key === 'Enter') {
+                handleSearch()
+              }
+            }}
+          />
+          <button className="search-icon" onClick={handleSearch}></button>
         </div>
       </div>
       <div className="sale-form-bx">
         <div className="check-form-box">
-          <input type="checkbox" id="ch01" />
+          <input
+            type="checkbox"
+            id="ch01"
+            checked={isMySurvey === userId}
+            onChange={() => {
+              setIsMySurvey(isMySurvey === userId ? null : userId)
+              // onItemsInit()
+            }}
+          />
           <label htmlFor="ch01">私が書いた物件</label>
         </div>
       </div>
       <div className="sale-form-bx">
-        <select className="select-form" name="" id="">
-          <option value="">最近の登録日</option>
-          <option value="">最近の登録日</option>
-          <option value="">最近の登録日</option>
-          <option value="">最近の登録日</option>
-          <option value="">最近の登録日</option>
+        <select
+          className="select-form"
+          name="sort-option"
+          id="sort-option"
+          value={sort}
+          onChange={(e) => {
+            setSort(e.target.value as 'created' | 'updated')
+            // onItemsInit()
+          }}
+        >
+          <option value="created">最近の登録日</option>
+          <option value="updated">最新の更新日</option>
         </select>
       </div>
     </div>

src/components/ui/Main.tsx

@@ -1,7 +1,6 @@
 'use client'
 
 import { useRouter } from 'next/navigation'
-
 export default function Main() {
   const router = useRouter()
 

src/components/ui/common/FloatBtn.tsx

@@ -5,9 +5,16 @@ import { usePathname } from 'next/navigation'
 export default function FloatBtn() {
   const pathname = usePathname()
 
+  const scrollToTop = () => {
+    window.scrollTo({
+      top: 0,
+      behavior: 'smooth',
+    })
+  }
+
   if (pathname === '/login' || pathname === '/') {
     return null
   }
 
-  return <button className="top-btn"></button>
+  return <button className="top-btn" onClick={scrollToTop}></button>
 }

src/components/ui/common/Footer.tsx

@@ -1,8 +1,17 @@
+'use client'
+
+import Link from 'next/link'
+
 export default function Footer() {
   return (
     <>
       <footer>
-        <div className="footer-inner">COPYRIGHT©2025 Hanwha Japan All Rights Reserved</div>
+        <div className="footer-inner">
+          COPYRIGHT©2025 Hanwha Japan All Rights Reserved{' '}
+          <span>
+            <Link href="/pdf">PDF</Link>
+          </span>
+        </div>
       </footer>
     </>
   )

src/hooks/useSuitable.ts

@@ -1,23 +1,20 @@
 import { useQuery } from '@tanstack/react-query'
-import { axiosInstance } from '@/libs/axios'
+import { axiosInstance, transformObjectKeys } from '@/libs/axios'
 import { useSuitableStore } from '@/store/useSuitableStore'
 import { useCommCode } from './useCommCode'
-import { SUITABLE_HEAD_CODE, type SuitableData, type SuitableMain, type SuitableDetail } from '@/types/Suitable'
+import { SUITABLE_HEAD_CODE, type SuitableDetailGroup, type SuitableMain, type Suitable, type SuitableDetail } from '@/types/Suitable'
 
 export function useSuitable() {
   const { getCommCode } = useCommCode()
   const { selectedCategory, searchValue, suitableCommCode, setSuitableCommCode, isSearch } = useSuitableStore()
 
-  const getSuitables = async (): Promise<SuitableData> => {
+  const getSuitables = async (): Promise<Suitable> => {
     try {
-      const response = await axiosInstance(null).get<SuitableData>('/api/suitable/list')
+      const response = await axiosInstance(null).get<Suitable>('/api/suitable/list')
       return response.data
     } catch (error) {
       console.error('지붕재 데이터 로드 실패:', error)
-      return {
-        suitable: [],
-        suitableDetail: [],
-      }
+      return { suitable: [], detail: [] }
     }
   }
 
@@ -42,10 +39,27 @@ export function useSuitable() {
 
   const toCodeName = (headCode: string, code: string): string => {
     const commCode = suitableCommCode.get(headCode)
-    return commCode?.find((item) => item.CODE === code)?.CODE_JP || ''
+    return commCode?.find((item) => item.code === code)?.codeJp || ''
   }
 
-  const { data: suitableList, isLoading: isInitialLoading } = useQuery<SuitableData>({
+  const toSuitableDetail = (mainId: number): SuitableDetail[] => {
+    try {
+      const suitableDetailString = suitableList?.detail.find((item) => item.mainId === mainId)?.detail
+      if (!suitableDetailString) {
+        return []
+      }
+      const suitableDetailArray = transformObjectKeys(JSON.parse(suitableDetailString)) as SuitableDetail[]
+      if (!Array.isArray(suitableDetailArray)) {
+        throw new Error('suitableDetailArray is not an array')
+      }
+      return suitableDetailArray
+    } catch (error) {
+      console.error('지붕재 데이터 파싱 실패:', error)
+      return []
+    }
+  }
+
+  const { data: suitableList, isLoading: isInitialLoading } = useQuery<Suitable>({
     queryKey: ['suitables', 'list'],
     queryFn: async () => await getSuitables(),
     staleTime: 1000 * 60 * 10, // 10분
@@ -56,25 +70,23 @@ export function useSuitable() {
     data: suitableSearchResults,
     refetch: refetchBySearch,
     isLoading: isSearchLoading,
-  } = useQuery<SuitableData>({
-    queryKey: ['suitables', 'search', selectedCategory, searchValue],
+  } = useQuery<Suitable>({
+    queryKey: ['suitables', 'search', selectedCategory, isSearch],
     queryFn: async () => {
       if (!isSearch && !selectedCategory) {
-        return suitableList ?? (await getSuitables()) // 검색 상태가 아니면 초기 데이터 반환 임시처리
+        // 검색 상태가 아니면 초기 데이터 반환 임시처리
+        return isInitialLoading ? await getSuitables() : suitableList ?? { suitable: [], detail: [] }
       } else {
-        const suitable = suitableList?.suitable.filter((item: SuitableMain) => {
-          const categoryMatch = !selectedCategory || item.ROOF_MT_CD === selectedCategory
-          const searchMatch = !searchValue || item.PRODUCT_NAME.includes(searchValue)
+        const filteredSuitable = suitableList?.suitable.filter((item: SuitableMain) => {
+          const categoryMatch = !selectedCategory || item.roofMtCd === selectedCategory
+          const searchMatch = !searchValue || item.productName.includes(searchValue)
           return categoryMatch && searchMatch
-        })
-        const mainIds = suitable?.map((item: SuitableMain) => item.ID)
-        const suitableDetail = suitableList?.suitableDetail.filter((item: SuitableDetail) => {
-          return mainIds?.includes(item.MAIN_ID)
-        })
-        return {
-          suitable: suitable ?? [],
-          suitableDetail: suitableDetail ?? [],
-        }
+        }) ?? []
+        const mainIds = filteredSuitable.map((item: SuitableMain) => item.id)
+        const filteredDetail = suitableList?.detail.filter((item: SuitableDetailGroup) => {
+          return mainIds.includes(item.mainId)
+        }) ?? []
+        return { suitable: filteredSuitable, detail: filteredDetail }
       }
     },
     staleTime: 1000 * 60 * 10,
@@ -82,26 +94,14 @@ export function useSuitable() {
     enabled: true,
   })
 
-  const filterSuitableDetail = (mainId: number): SuitableDetail[] | undefined => {
-    const result: SuitableDetail[] = []
-    for (const subItem of suitableSearchResults?.suitableDetail ?? []) {
-      if (subItem.MAIN_ID > mainId) break
-      if (subItem.MAIN_ID === mainId) {
-        result.push(subItem)
-      }
-    }
-    return result
-  }
-
   return {
     getSuitables,
     getSuitableCommCode,
     toCodeName,
+    toSuitableDetail,
     suitableList,
-    isInitialLoading,
     suitableSearchResults,
     refetchBySearch,
     isSearchLoading,
-    filterSuitableDetail,
   }
 }

src/hooks/useSuitableRaw.ts

@@ -0,0 +1,109 @@
+import { useQuery } from '@tanstack/react-query'
+import { axiosInstance, transformObjectKeys } from '@/libs/axios'
+import { useSuitableStore } from '@/store/useSuitableStore'
+import { useCommCode } from './useCommCode'
+import { SUITABLE_HEAD_CODE, type SuitableDetail } from '@/types/Suitable'
+
+export type Suitable = {
+  id: number
+  productName: string
+  manuFtCd: string
+  roofMtCd: string
+  roofShCd: string
+  detail: string
+}
+
+export function useSuitableRaw() {
+  const { getCommCode } = useCommCode()
+  const { selectedCategory, searchValue, suitableCommCode, setSuitableCommCode, isSearch } = useSuitableStore()
+
+  const getSuitables = async (): Promise<Suitable[]> => {
+    try {
+      const response = await axiosInstance(null).get<Suitable[]>('/api/suitable/list/test')
+      return response.data
+    } catch (error) {
+      console.error('지붕재 데이터 로드 실패:', error)
+      return []
+    }
+  }
+
+  // const updateSearchResults = async (selectedCategory: string | undefined, searchValue: string | undefined): Promise<SuitableData[]> => {
+  //   try {
+  //     const response = await axiosInstance(null).get<SuitableData[]>('/api/suitable/list', { params: { selectedCategory, searchValue } })
+  //     return response.data
+  //   } catch (error) {
+  //     console.error('지붕재 데이터 검색 실패:', error)
+  //     return []
+  //   }
+  // }
+
+  const getSuitableCommCode = () => {
+    const headCodes = Object.values(SUITABLE_HEAD_CODE) as SUITABLE_HEAD_CODE[]
+    for (const code of headCodes) {
+      getCommCode(code).then((res) => {
+        setSuitableCommCode(code, res)
+      })
+    }
+  }
+
+  const toCodeName = (headCode: string, code: string): string => {
+    const commCode = suitableCommCode.get(headCode)
+    return commCode?.find((item) => item.code === code)?.codeJp || ''
+  }
+
+  const toSuitableDetail = (suitableDetailString: string): SuitableDetail[] => {
+    try {
+      const suitableDetailArray = transformObjectKeys(JSON.parse(suitableDetailString)) as SuitableDetail[]
+      if (!Array.isArray(suitableDetailArray)) {
+        throw new Error('suitableDetailArray is not an array')
+      }
+      return suitableDetailArray
+    } catch (error) {
+      console.error('지붕재 데이터 파싱 실패:', error)
+      return []
+    }
+  }
+
+  const { data: suitableList, isLoading: isInitialLoading } = useQuery<Suitable[]>({
+    queryKey: ['suitables', 'list'],
+    queryFn: async () => await getSuitables(),
+    staleTime: 1000 * 60 * 10, // 10분
+    gcTime: 1000 * 60 * 10, // 10분
+  })
+
+  const {
+    data: suitableSearchResults,
+    refetch: refetchBySearch,
+    isLoading: isSearchLoading,
+    // } = useQuery<SuitableData>({
+  } = useQuery<Suitable[]>({
+    queryKey: ['suitables', 'search', selectedCategory, isSearch],
+    queryFn: async () => {
+      if (!isSearch && !selectedCategory) {
+        return isInitialLoading ? await getSuitables() : suitableList ?? [] // 검색 상태가 아니면 초기 데이터 반환 임시처리
+      } else {
+        return (
+          suitableList?.filter((item: Suitable) => {
+            const categoryMatch = !selectedCategory || item.roofMtCd === selectedCategory
+            const searchMatch = !searchValue || item.productName.includes(searchValue)
+            return categoryMatch && searchMatch
+          }) ?? []
+        )
+      }
+    },
+    staleTime: 1000 * 60 * 10,
+    gcTime: 1000 * 60 * 10,
+    enabled: true,
+  })
+
+  return {
+    getSuitables,
+    getSuitableCommCode,
+    toCodeName,
+    toSuitableDetail,
+    suitableList,
+    suitableSearchResults,
+    refetchBySearch,
+    isSearchLoading,
+  }
+}

src/hooks/useSurvey.ts

@@ -0,0 +1,232 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import type { SurveyBasicInfo, SurveyDetailInfo, SurveyDetailRequest, SurveyDetailCoverRequest, SurveyRegistRequest } from '@/types/Survey'
+import { axiosInstance } from '@/libs/axios'
+import { useSurveyFilterStore } from '@/store/surveyFilterStore'
+import { queryStringFormatter } from '@/utils/common-utils'
+import { useSessionStore } from '@/store/session'
+import { useMemo } from 'react'
+import { AxiosResponse } from 'axios'
+
+const requiredFields = [
+  {
+    field: 'installationSystem',
+    name: '設置希望システム',
+  },
+  {
+    field: 'constructionYear',
+    name: '建築年数',
+  },
+  {
+    field: 'rafterSize',
+    name: '垂木サイズ',
+  },
+  {
+    field: 'rafterPitch',
+    name: '垂木傾斜',
+  },
+  {
+    field: 'waterproofMaterial',
+    name: '防水材',
+  },
+  {
+    field: 'insulationPresence',
+    name: '断熱材有無',
+  },
+  {
+    field: 'structureOrder',
+    name: '屋根構造の順序',
+  },
+]
+
+interface ZipCodeResponse {
+  status: number
+  message: string | null
+  results: ZipCode[] | null
+}
+
+type ZipCode = {
+  zipcode: string
+  prefcode: string
+  address1: string
+  address2: string
+  address3: string
+  kana1: string
+  kana2: string
+  kana3: string
+}
+
+export function useServey(id?: number): {
+  surveyList: { data: SurveyBasicInfo[]; count: number } | {}
+  surveyDetail: SurveyBasicInfo | null
+  isLoadingSurveyList: boolean
+  isLoadingSurveyDetail: boolean
+  isCreatingSurvey: boolean
+  isUpdatingSurvey: boolean
+  isDeletingSurvey: boolean
+  createSurvey: (survey: SurveyRegistRequest) => Promise<number>
+  createSurveyDetail: (params: { surveyId: number; surveyDetail: SurveyDetailCoverRequest }) => void
+  updateSurvey: (survey: SurveyRegistRequest) => void
+  deleteSurvey: () => Promise<boolean>
+  submitSurvey: () => void
+  validateSurveyDetail: (surveyDetail: SurveyDetailRequest) => string
+  getZipCode: (zipCode: string) => Promise<ZipCode[] | null>
+  refetchSurveyList: () => void
+} {
+  const queryClient = useQueryClient()
+  const { keyword, searchOption, isMySurvey, sort, offset } = useSurveyFilterStore()
+  const { session } = useSessionStore()
+
+  const {
+    data,
+    isLoading: isLoadingSurveyList,
+    refetch: refetchSurveyList,
+  } = useQuery({
+    queryKey: ['survey', 'list', keyword, searchOption, isMySurvey, sort, offset, session?.storeNm, session?.builderNo, session?.role],
+    queryFn: async () => {
+      const resp = await axiosInstance(null).get<{ data: SurveyBasicInfo[]; count: number }>('/api/survey-sales', {
+        params: {
+          keyword,
+          searchOption,
+          isMySurvey,
+          sort,
+          offset,
+          store: session?.storeNm,
+          builderNo: session?.builderNo,
+          role: session?.role,
+        },
+      })
+      return resp.data
+    },
+    enabled: session?.isLoggedIn,
+  })
+  const surveyData = useMemo(() => {
+    if (!data) return {}
+    return {
+      data: data.data,
+      count: data.count,
+    }
+  }, [data])
+
+  const { data: surveyDetail, isLoading: isLoadingSurveyDetail } = useQuery({
+    queryKey: ['survey', id],
+    queryFn: async () => {
+      if (id === undefined) throw new Error('id is required')
+      if (id === null) return null
+      const resp = await axiosInstance(null).get<SurveyBasicInfo>(`/api/survey-sales/${id}`)
+      return resp.data
+    },
+    enabled: id !== undefined,
+  })
+
+  const { mutateAsync: createSurvey, isPending: isCreatingSurvey } = useMutation({
+    mutationFn: async (survey: SurveyRegistRequest) => {
+      const resp = await axiosInstance(null).post<SurveyBasicInfo>('/api/survey-sales', survey)
+      return resp.data.id ?? 0
+    },
+    onSuccess: (data) => {
+      queryClient.invalidateQueries({ queryKey: ['survey', 'list'] })
+      queryClient.invalidateQueries({ queryKey: ['survey', id] })
+      return data
+    },
+  })
+
+  const { mutate: updateSurvey, isPending: isUpdatingSurvey } = useMutation({
+    mutationFn: async (survey: SurveyRegistRequest) => {
+      if (id === undefined) throw new Error('id is required')
+      const resp = await axiosInstance(null).put<SurveyRegistRequest>(`/api/survey-sales/${id}`, survey)
+      return resp.data
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['survey', id] })
+      queryClient.invalidateQueries({ queryKey: ['survey', 'list'] })
+    },
+  })
+
+  const { mutateAsync: deleteSurvey, isPending: isDeletingSurvey } = useMutation({
+    mutationFn: async () => {
+      if (id === null) throw new Error('id is required')
+      const resp = await axiosInstance(null).delete<boolean>(`/api/survey-sales/${id}`)
+      return resp.data
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['survey', 'list'] })
+      queryClient.invalidateQueries({ queryKey: ['survey', id] })
+    },
+  })
+
+  const { mutateAsync: createSurveyDetail } = useMutation({
+    mutationFn: async ({ surveyId, surveyDetail }: { surveyId: number; surveyDetail: SurveyDetailCoverRequest }) => {
+      const resp = await axiosInstance(null).patch<SurveyDetailInfo>(`/api/survey-sales/${surveyId}`, surveyDetail)
+      return resp.data
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['survey', 'list'] })
+      queryClient.invalidateQueries({ queryKey: ['survey', id] })
+    },
+  })
+
+  const { mutateAsync: submitSurvey } = useMutation({
+    mutationFn: async () => {
+      if (id === undefined) throw new Error('id is required')
+      const resp = await axiosInstance(null).patch<boolean>(`/api/survey-sales/${id}`, {
+        submit: true,
+      })
+      return resp.data
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['survey', 'list'] })
+      queryClient.invalidateQueries({ queryKey: ['survey', id] })
+    },
+  })
+
+  const validateSurveyDetail = (surveyDetail: SurveyDetailRequest) => {
+    const etcFields = ['installationSystem', 'constructionYear', 'rafterSize', 'rafterPitch', 'waterproofMaterial', 'structureOrder'] as const
+
+    const emptyField = requiredFields.find((field) => {
+      if (etcFields.includes(field.field as (typeof etcFields)[number])) {
+        return (
+          surveyDetail[field.field as keyof SurveyDetailRequest] === null && surveyDetail[`${field.field}_ETC` as keyof SurveyDetailRequest] === ''
+        )
+      } else {
+        return surveyDetail[field.field as keyof SurveyDetailRequest] === null
+      }
+    })
+
+    const contractCapacity = surveyDetail.contractCapacity
+    if (contractCapacity && contractCapacity.trim() !== '' && contractCapacity.split(' ')?.length === 1) {
+      return 'contractCapacityUnit'
+    }
+
+    return emptyField?.name || ''
+  }
+
+  const getZipCode = async (zipCode: string): Promise<ZipCode[] | null> => {
+    try {
+      const { data } = await axiosInstance(null).get<ZipCodeResponse>(
+        `https://zipcloud.ibsnet.co.jp/api/search?${queryStringFormatter({ zipcode: zipCode.trim() })}`,
+      )
+      return data.results
+    } catch (e) {
+      console.error('Failed to fetch zipcode data:', e)
+      throw new Error('Failed to fetch zipcode data')
+    }
+  }
+
+  return {
+    surveyList: surveyData,
+    surveyDetail: surveyDetail as SurveyBasicInfo | null,
+    isLoadingSurveyList,
+    isLoadingSurveyDetail,
+    isCreatingSurvey,
+    isUpdatingSurvey,
+    isDeletingSurvey,
+    createSurvey,
+    updateSurvey,
+    deleteSurvey,
+    createSurveyDetail,
+    submitSurvey,
+    validateSurveyDetail,
+    getZipCode,
+    refetchSurveyList,
+  }
+}

src/libs/axios.ts

@@ -1,38 +1,61 @@
 import axios from 'axios'
+import { tracking } from './tracking'
 
 export const axiosInstance = (url: string | null | undefined) => {
   const baseURL = url || process.env.NEXT_PUBLIC_API_URL
-
-  return axios.create({
+  const instance = axios.create({
     baseURL,
     headers: {
       Accept: 'application/json',
     },
   })
-}
 
-// Request interceptor
-axios.interceptors.request.use(
+  instance.interceptors.request.use(
     (config) => {
-    // 여기에 토큰 추가 등의 공통 로직을 넣을 수 있습니다
+      console.log('🚀 ~ config:', config)
       return config
     },
     (error) => {
       return Promise.reject(error)
     },
-)
+  )
 
-// Response interceptor
-axios.interceptors.response.use(
-  (response) => transferResponse(response),
+  instance.interceptors.response.use(
+    (response) => {
+      response.data = transferResponse(response)
+      return response
+    },
     (error) => {
       // 에러 처리 로직
       return Promise.reject(error)
     },
-)
+  )
+
+  return instance
+}
+
+// Request interceptor
+// axios.interceptors.request.use(
+//   (config) => {
+//     // 여기에 토큰 추가 등의 공통 로직을 넣을 수 있습니다
+//     return config
+//   },
+//   (error) => {
+//     return Promise.reject(error)
+//   },
+// )
+
+// Response interceptor
+// axios.interceptors.response.use(
+//   (response) => transferResponse(response),
+//   (error) => {
+//     // 에러 처리 로직
+//     return Promise.reject(error)
+//   },
+// )
 
 // response데이터가  array, object에 따라 분기하여 키 변환
-const transferResponse = (response: any) => {
+export const transferResponse = (response: any) => {
   if (!response.data) return response.data
 
   // 배열인 경우 각 객체의 키를 변환
@@ -45,7 +68,7 @@ const transferResponse = (response: any) => {
 }
 
 // camel case object 반환
-const transformObjectKeys = (obj: any): any => {
+export const transformObjectKeys = (obj: any): any => {
   if (Array.isArray(obj)) {
     return obj.map(transformObjectKeys)
   }
@@ -60,7 +83,11 @@ const transformObjectKeys = (obj: any): any => {
 
   return obj
 }
-// snake case to camel case
-const snakeToCamel = (str: string): string => {
-  return str.replace(/([-_][a-z])/g, (group) => group.toUpperCase().replace('-', '').replace('_', ''))
+
+export const camelToSnake = (str: string): string => {
+  return str.replace(/([A-Z])/g, (group) => `_${group.toLowerCase()}`)
+}
+
+const snakeToCamel = (str: string): string => {
+  return str.toLowerCase().replace(/([-_][a-z])/g, (group) => group.toUpperCase().replace('-', '').replace('_', ''))
 }

src/libs/tracking.ts

@@ -0,0 +1,10 @@
+import { axiosInstance } from './axios'
+
+export const tracking = async (params: { url: string; data: string }) => {
+  const { url, data } = params
+  const result = await axiosInstance(null).post('/api/tracking', {
+    url,
+    data,
+  })
+  console.log('🚀 ~ result ~ result:', result)
+}

src/store/addressStore.ts

@@ -0,0 +1,19 @@
+import { create } from 'zustand'
+
+type AddressData = {
+  post_code: string
+  address: string
+  address_detail: string
+}
+
+interface AddressState {
+  addressData: AddressData | null
+  setAddressData: (address: AddressData) => void
+  resetAddressData: () => void
+}
+
+export const useAddressStore = create<AddressState>((set) => ({
+  addressData: null,
+  setAddressData: (address) => set({ addressData: address }),
+  resetAddressData: () => set({ addressData: null }),
+}))

src/store/inquiryFilterStore.ts

@@ -0,0 +1,41 @@
+import { create } from 'zustand'
+
+export const FILTER_OPTIONS = [
+  {
+    id: 'all',
+    label: '全体',
+  },
+  {
+    id: 'completed',
+    label: '回答完了',
+  },
+  {
+    id: 'waiting',
+    label: '回答待ち',
+  },
+]
+export type FILTER_OPTIONS_ENUM = (typeof FILTER_OPTIONS)[number]['id']
+
+type InquiryFilterState = {
+  keyword: string
+  filter: FILTER_OPTIONS_ENUM
+  isMySurvey: string | null
+  offset: number
+  setKeyword: (keyword: string) => void
+  setFilter: (filter: FILTER_OPTIONS_ENUM) => void
+  setIsMySurvey: (isMySurvey: string | null) => void
+  setOffset: (offset: number) => void
+  reset: () => void
+}
+
+export const useInquiryFilterStore = create<InquiryFilterState>((set) => ({
+  keyword: '',
+  filter: 'all',
+  isMySurvey: null,
+  offset: 0,
+  setKeyword: (keyword) => set({ keyword }),
+  setFilter: (filter) => set({ filter }),
+  setIsMySurvey: (isMySurvey) => set({ isMySurvey }),
+  setOffset: (offset) => set({ offset }),
+  reset: () => set({ keyword: '', filter: 'all', isMySurvey: null, offset: 0 }),
+}))

src/store/surveyFilterStore.ts

@@ -0,0 +1,87 @@
+import { create } from 'zustand'
+
+export const SEARCH_OPTIONS = [
+  {
+    id: 'all',
+    label: '全体',
+  },
+  {
+    id: 'id',
+    label: '登録番号',
+  },
+  {
+    id: 'building_name',
+    label: '建物名',
+  },
+  {
+    id: 'representative',
+    label: '作成者',
+  },
+  {
+    id: 'store',
+    label: '販売店名',
+  },
+  //   {
+  //     id: 'store_id',
+  //     label: '販売店ID',
+  //   },
+  {
+    id: 'construction_point',
+    label: '施工店名',
+  },
+  //   {
+  //     id: 'construction_id',
+  //     label: '施工店ID',
+  //   },
+]
+
+export const SEARCH_OPTIONS_PARTNERS = [
+  {
+    id: 'all',
+    label: '全体',
+  },
+  {
+    id: 'id',
+    label: '登録番号',
+  },
+  {
+    id: 'building_name',
+    label: '建物名',
+  },
+  {
+    id: 'representative',
+    label: '作成者',
+  },
+]
+
+export type SEARCH_OPTIONS_ENUM = (typeof SEARCH_OPTIONS)[number]['id']
+export type SEARCH_OPTIONS_PARTNERS_ENUM = (typeof SEARCH_OPTIONS_PARTNERS)[number]['id']
+export type SORT_OPTIONS_ENUM = 'created' | 'updated'
+
+type SurveyFilterState = {
+  keyword: string
+  searchOption: SEARCH_OPTIONS_ENUM | SEARCH_OPTIONS_PARTNERS_ENUM
+  isMySurvey: string | null
+  sort: SORT_OPTIONS_ENUM
+  offset: number
+  setKeyword: (keyword: string) => void
+  setSearchOption: (searchOption: SEARCH_OPTIONS_ENUM | SEARCH_OPTIONS_PARTNERS_ENUM) => void
+  setIsMySurvey: (isMySurvey: string | null) => void
+  setSort: (sort: SORT_OPTIONS_ENUM) => void
+  setOffset: (offset: number) => void
+  reset: () => void
+}
+
+export const useSurveyFilterStore = create<SurveyFilterState>((set) => ({
+  keyword: '',
+  searchOption: 'all',
+  isMySurvey: null,
+  sort: 'created',
+  offset: 0,
+  setKeyword: (keyword: string) => set({ keyword }),
+  setSearchOption: (searchOption: SEARCH_OPTIONS_ENUM | SEARCH_OPTIONS_PARTNERS_ENUM) => set({ searchOption }),
+  setIsMySurvey: (isMySurvey: string | null) => set({ isMySurvey }),
+  setSort: (sort: SORT_OPTIONS_ENUM) => set({ sort }),
+  setOffset: (offset: number) => set({ offset }),
+  reset: () => set({ keyword: '', searchOption: 'all', isMySurvey: null, sort: 'created', offset: 0 }),
+}))

src/styles/base/_button.scss

@@ -49,6 +49,14 @@
     background-size: cover;
     margin-left: 12px;
   }
+  .btn-arr-up{
+    display: block;
+    width: 10px;
+    height: 6px;
+    background: url(/assets/images/common/btn_arr_up.svg)no-repeat center;
+    background-size: cover;
+    margin-left: 12px;
+  }
   .btn-edit{
     display: block;
     width: 10px;

src/types/Auth.ts

@@ -10,11 +10,11 @@ export interface SessionData {
   storeNm: null
   userId: null
   category: null
-  userNm: null
-  userNmKana: null
+  userNm: null | string
+  userNmKana: null | string
   telNo: null
   fax: null
-  email: null
+  email: null | string
   lastEditUser: null
   storeGubun: null
   pwCurr: null

src/types/CommCode.ts

@@ -1,5 +1,5 @@
 export type CommCode = {
-  HEAD_CD: string
-  CODE: string
-  CODE_JP: string
+  headCd: string
+  code: string
+  codeJp: string
 }

src/types/Suitable.ts

@@ -9,32 +9,36 @@ export enum SUITABLE_HEAD_CODE {
   TRESTLE_MFPC_CD = 'TRESTLE_MFPC_CD',
 }
 
-export type SuitableIncludeDetail = {
-  ID: number
-  PRODUCT_NAME: string
-  MANU_FT_CD: string
-  ROOF_MT_CD: string
-  ROOF_SH_CD: string
-  MS_SUITABLE_DETAIL: SuitableDetail[]
-}
-
-export type SuitableData = {
-  suitable: SuitableMain[]
-  suitableDetail: SuitableDetail[]
-}
-
 export type SuitableMain = {
-  ID: number
-  PRODUCT_NAME: string
-  MANU_FT_CD: string
-  ROOF_MT_CD: string
-  ROOF_SH_CD: string
+  id: number
+  productName: string
+  manuFtCd: string
+  roofMtCd: string
+  roofShCd: string
 }
 
 export type SuitableDetail = {
-  ID: number
-  MAIN_ID: number
-  TRESTLE_MFPC_CD: string
-  TRESTLE_MANUFACTURER_PRODUCT_NAME: string
-  MEMO: string
+  id: number
+  mainId: number
+  trestleMfpcCd: string
+  trestleManufacturerProductName: string
+  memo: string
+}
+
+// export type Suitable = {
+//   id: number
+//   productName: string
+//   manuFtCd: string
+//   roofMtCd: string
+//   roofShCd: string
+//   detail: string
+// }
+
+export type SuitableDetailGroup = {
+  mainId: number
+  detail: string
+}
+export type Suitable = {
+  suitable: SuitableMain[]
+  detail: SuitableDetailGroup[]
 }

src/types/Survey.ts

@@ -1,132 +1,132 @@
-import { SEARCH_OPTIONS_ENUM, SEARCH_OPTIONS_PARTNERS_ENUM, SORT_OPTIONS_ENUM } from '@/store/surveyFilterStore'
-
 export type SurveyBasicInfo = {
-  ID: number
-  REPRESENTATIVE: string
-  STORE: string | null
-  CONSTRUCTION_POINT: string | null
-  INVESTIGATION_DATE: string | null
-  BUILDING_NAME: string | null
-  CUSTOMER_NAME: string | null
-  POST_CODE: string | null
-  ADDRESS: string | null
-  ADDRESS_DETAIL: string | null
-  SUBMISSION_STATUS: boolean
-  SUBMISSION_DATE: string | null
-  DETAIL_INFO: SurveyDetailInfo | null
-  REG_DT: Date
-  UPT_DT: Date
+  id: number
+  representative: string
+  store: string | null
+  constructionPoint: string | null
+  investigationDate: string | null
+  buildingName: string | null
+  customerName: string | null
+  postCode: string | null
+  address: string | null
+  addressDetail: string | null
+  submissionStatus: boolean
+  submissionDate: string | null
+  detailInfo: SurveyDetailInfo | null
+  regDt: Date
+  uptDt: Date
 }
 
 export type SurveyDetailInfo = {
-  ID: number
-  BASIC_INFO_ID: number
-  CONTRACT_CAPACITY: string | null
-  RETAIL_COMPANY: string | null
-  SUPPLEMENTARY_FACILITIES: string | null // number 배열
-  SUPPLEMENTARY_FACILITIES_ETC: string | null
-  INSTALLATION_SYSTEM: string | null
-  INSTALLATION_SYSTEM_ETC: string | null
-  CONSTRUCTION_YEAR: string | null
-  CONSTRUCTION_YEAR_ETC: string | null
-  ROOF_MATERIAL: string | null // number 배열
-  ROOF_MATERIAL_ETC: string | null
-  ROOF_SHAPE: string | null
-  ROOF_SHAPE_ETC: string | null
-  ROOF_SLOPE: string | null
-  HOUSE_STRUCTURE: string | null
-  HOUSE_STRUCTURE_ETC: string | null
-  RAFTER_MATERIAL: string | null
-  RAFTER_MATERIAL_ETC: string | null
-  RAFTER_SIZE: string | null
-  RAFTER_SIZE_ETC: string | null
-  RAFTER_PITCH: string | null
-  RAFTER_PITCH_ETC: string | null
-  RAFTER_DIRECTION: string | null
-  OPEN_FIELD_PLATE_KIND: string | null
-  OPEN_FIELD_PLATE_KIND_ETC: string | null
-  OPEN_FIELD_PLATE_THICKNESS: string | null
-  LEAK_TRACE: boolean | null
-  WATERPROOF_MATERIAL: string | null
-  WATERPROOF_MATERIAL_ETC: string | null
-  INSULATION_PRESENCE: string | null
-  INSULATION_PRESENCE_ETC: string | null
-  STRUCTURE_ORDER: string | null
-  STRUCTURE_ORDER_ETC: string | null
-  INSTALLATION_AVAILABILITY: string | null
-  INSTALLATION_AVAILABILITY_ETC: string | null
-  MEMO: string | null
-  REG_DT: Date
-  UPT_DT: Date
+  id: number
+  basicInfoId: number
+  contractCapacity: string | null
+  retailCompany: string | null
+  supplementaryFacilities: string | null // number 배열
+  supplementaryFacilitiesEtc: string | null
+  installationSystem: string | null
+  installationSystemEtc: string | null
+  constructionYear: string | null
+  constructionYearEtc: string | null
+  roofMaterial: string | null // number 배열
+  roofMaterialEtc: string | null
+  roofShape: string | null
+  roofShapeEtc: string | null
+  roofSlope: string | null
+  houseStructure: string | null
+  houseStructureEtc: string | null
+  rafterMaterial: string | null
+  rafterMaterialEtc: string | null
+  rafterSize: string | null
+  rafterSizeEtc: string | null
+  rafterPitch: string | null
+  rafterPitchEtc: string | null
+  rafterDirection: string | null
+  openFieldPlateKind: string | null
+  openFieldPlateKindEtc: string | null
+  openFieldPlateThickness: string | null
+  leakTrace: boolean | null
+  waterproofMaterial: string | null
+  waterproofMaterialEtc: string | null
+  insulationPresence: string | null
+  insulationPresenceEtc: string | null
+  structureOrder: string | null
+  structureOrderEtc: string | null
+  installationAvailability: string | null
+  installationAvailabilityEtc: string | null
+  memo: string | null
+  regDt: Date
+  uptDt: Date
 }
 
 export type SurveyBasicRequest = {
-  REPRESENTATIVE: string
-  STORE: string | null
-  CONSTRUCTION_POINT: string | null
-  INVESTIGATION_DATE: string | null
-  BUILDING_NAME: string | null
-  CUSTOMER_NAME: string | null
-  POST_CODE: string | null
-  ADDRESS: string | null
-  ADDRESS_DETAIL: string | null
-  SUBMISSION_STATUS: boolean
-  SUBMISSION_DATE: string | null
+  representative: string
+  store: string | null
+  constructionPoint: string | null
+  investigationDate: string | null
+  buildingName: string | null
+  customerName: string | null
+  postCode: string | null
+  address: string | null
+  addressDetail: string | null
+  submissionStatus: boolean
+  submissionDate: string | null
 }
 
 export type SurveyDetailRequest = {
-  CONTRACT_CAPACITY: string | null
-  RETAIL_COMPANY: string | null
-  SUPPLEMENTARY_FACILITIES: string | null // number 배열
-  SUPPLEMENTARY_FACILITIES_ETC: string | null
-  INSTALLATION_SYSTEM: string | null
-  INSTALLATION_SYSTEM_ETC: string | null
-  CONSTRUCTION_YEAR: string | null
-  CONSTRUCTION_YEAR_ETC: string | null
-  ROOF_MATERIAL: string | null // number 배열
-  ROOF_MATERIAL_ETC: string | null
-  ROOF_SHAPE: string | null
-  ROOF_SHAPE_ETC: string | null
-  ROOF_SLOPE: string | null
-  HOUSE_STRUCTURE: string | null
-  HOUSE_STRUCTURE_ETC: string | null
-  RAFTER_MATERIAL: string | null
-  RAFTER_MATERIAL_ETC: string | null
-  RAFTER_SIZE: string | null
-  RAFTER_SIZE_ETC: string | null
-  RAFTER_PITCH: string | null
-  RAFTER_PITCH_ETC: string | null
-  RAFTER_DIRECTION: string | null
-  OPEN_FIELD_PLATE_KIND: string | null
-  OPEN_FIELD_PLATE_KIND_ETC: string | null
-  OPEN_FIELD_PLATE_THICKNESS: string | null
-  LEAK_TRACE: boolean | null
-  WATERPROOF_MATERIAL: string | null
-  WATERPROOF_MATERIAL_ETC: string | null
-  INSULATION_PRESENCE: string | null
-  INSULATION_PRESENCE_ETC: string | null
-  STRUCTURE_ORDER: string | null
-  STRUCTURE_ORDER_ETC: string | null
-  INSTALLATION_AVAILABILITY: string | null
-  INSTALLATION_AVAILABILITY_ETC: string | null
-  MEMO: string | null
+  contractCapacity: string | null
+  retailCompany: string | null
+  supplementaryFacilities: string | null // number 배열
+  supplementaryFacilitiesEtc: string | null
+  installationSystem: string | null
+  installationSystemEtc: string | null
+  constructionYear: string | null
+  constructionYearEtc: string | null
+  roofMaterial: string | null // number 배열
+  roofMaterialEtc: string | null
+  roofShape: string | null
+  roofShapeEtc: string | null
+  roofSlope: string | null
+  houseStructure: string | null
+  houseStructureEtc: string | null
+  rafterMaterial: string | null
+  rafterMaterialEtc: string | null
+  rafterSize: string | null
+  rafterSizeEtc: string | null
+  rafterPitch: string | null
+  rafterPitchEtc: string | null
+  rafterDirection: string | null
+  openFieldPlateKind: string | null
+  openFieldPlateKindEtc: string | null
+  openFieldPlateThickness: string | null
+  leakTrace: boolean | null
+  waterproofMaterial: string | null
+  waterproofMaterialEtc: string | null
+  insulationPresence: string | null
+  insulationPresenceEtc: string | null
+  structureOrder: string | null
+  structureOrderEtc: string | null
+  installationAvailability: string | null
+  installationAvailabilityEtc: string | null
+  memo: string | null
 }
 
 export type SurveyDetailCoverRequest = {
-  DETAIL_INFO: SurveyDetailRequest
+  detailInfo: SurveyDetailRequest
 }
 
 export type SurveyRegistRequest = {
-  REPRESENTATIVE: string
-  STORE: string | null
-  CONSTRUCTION_POINT: string | null
-  INVESTIGATION_DATE: string | null
-  BUILDING_NAME: string | null
-  CUSTOMER_NAME: string | null
-  POST_CODE: string | null
-  ADDRESS: string | null
-  ADDRESS_DETAIL: string | null
-  SUBMISSION_STATUS: boolean
-  SUBMISSION_DATE: string | null
-  DETAIL_INFO: SurveyDetailRequest | null
+  representative: string
+  store: string | null
+  constructionPoint: string | null
+  investigationDate: string | null
+  buildingName: string | null
+  customerName: string | null
+  postCode: string | null
+  address: string | null
+  addressDetail: string | null
+  submissionStatus: boolean
+  submissionDate: string | null
+  detailInfo: SurveyDetailRequest | null
 }
+
+export type Mode = 'CREATE' | 'EDIT' | 'READ' | 'TEMP' // 등록 | 수정 | 상세 | 임시저장

src/utils/common-utils.js

@@ -0,0 +1,187 @@
+/**
+ * Check if an object is not empty.
+ * @param {Object} obj - The object to check.
+ * @returns {boolean} - Returns true if the object is not empty, false otherwise.
+ */
+export const isObjectNotEmpty = (obj) => {
+  if (!obj) {
+    return false
+  }
+  return Object.keys(obj).length > 0
+}
+
+export const isNotEmptyArray = (array) => {
+  return Array.isArray(array) && array.length
+}
+
+export const isEmptyArray = (array) => {
+  return !isNotEmptyArray(array)
+}
+
+/**
+ * ex) const params = {page:10, searchDvsnCd: 20}
+ * @param {*} params
+ * @returns page=10&searchDvsnCd=20
+ */
+export const queryStringFormatter = (params = {}) => {
+  const queries = []
+  Object.keys(params).forEach((parameterKey) => {
+    const parameterValue = params[parameterKey]
+
+    if (parameterValue === undefined || parameterValue === null) {
+      return
+    }
+
+    // string trim
+    if (typeof parameterValue === 'string' && !parameterValue.trim()) {
+      return
+    }
+
+    // array to query string
+    if (Array.isArray(parameterValue)) {
+      // primitive type
+      if (parameterValue.every((v) => typeof v === 'number' || typeof v === 'string')) {
+        queries.push(`${encodeURIComponent(parameterKey)}=${parameterValue.map((v) => encodeURIComponent(v)).join(',')}`)
+        return
+      }
+      // reference type
+      if (parameterValue.every((v) => typeof v === 'object' && v !== null)) {
+        parameterValue.map((pv, i) => {
+          return Object.keys(pv).forEach((valueKey) => {
+            queries.push(`${encodeURIComponent(`${parameterKey}[${i}].${valueKey}`)}=${encodeURIComponent(pv[valueKey])}`)
+          })
+        })
+        return
+      }
+    }
+    // 나머지
+    queries.push(`${encodeURIComponent(parameterKey)}=${encodeURIComponent(parameterValue)}`)
+  })
+  return queries.join('&')
+}
+
+// 43000 --> 43,000
+export const convertNumberToPriceDecimal = (value) => {
+  if (value) return Number(value).toLocaleString()
+  else if (value === 0) return 0
+  else return ''
+}
+
+// 43000.458 --> 43,000.46
+export const convertNumberToPriceDecimalToFixed = (value, fixed) => {
+  if (value) return Number(value).toLocaleString(undefined, { minimumFractionDigits: fixed, maximumFractionDigits: fixed })
+  else if (value === 0) return 0
+  else return ''
+}
+
+// 전화번호, FAX 번호 숫자 or '-'만 입력 체크
+export const inputTelNumberCheck = (e) => {
+  const input = e.target
+  if (/^[\d-]*$/g.test(input.value)) {
+    input.value = input.value
+  } else {
+    input.value = input.value.replace(/[^\d-]/g, '')
+  }
+}
+
+// 숫자만 입력 체크
+export const inputNumberCheck = (e) => {
+  const input = e.target
+  if (/^[\d]*$/g.test(input.value)) {
+    input.value = input.value
+  } else {
+    input.value = input.value.replace(/[^\d]/g, '')
+  }
+}
+
+// 값이 숫자인지 확인
+export const numberCheck = (value) => {
+  return !isNaN(value)
+}
+
+/**
+ * 파이프함수 정의
+ * @param  {...any} fns 순수함수들
+ * @returns
+ */
+export const pipe =
+  (...fns) =>
+  (x) =>
+    fns.reduce((v, f) => f(v), x)
+
+/**
+ * 캔버스 각도에 따른 흐름 방향 계산
+ * @param {number} canvasAngle
+ * @returns {object} 흐름 방향 객체
+ */
+export const calculateFlowDirection = (canvasAngle) => {
+  return {
+    down: -canvasAngle,
+    up: 180 - canvasAngle,
+    left: 90 - canvasAngle < 180 ? 90 - canvasAngle : 90 - canvasAngle - 360,
+    right: -90 - canvasAngle < -180 ? -90 - canvasAngle + 360 : -90 - canvasAngle,
+  }
+}
+
+/**
+ * 자바스크립트 객체로 쿼리스트링 생성
+ * @param {javascript object} o 쿼리스트링 생성할 객체
+ * @returns {string} 쿼리스트링
+ */
+export const getQueryString = (o) => {
+  const queryString = Object.keys(o)
+    .map((key) => `${key}=${o[key] ?? ''}`)
+    .join('&')
+  return `?${queryString}`
+}
+
+export const unescapeString = (str) => {
+  const regex = /&(amp|lt|gt|quot|#39);/g
+  const chars = {
+    '&amp;': '&',
+    '&lt;': '<',
+    '&gt;': '>',
+    '&quot;': '"',
+    '&#39;': "'",
+  }
+
+  /*
+  1. 한번 변환은 {&quot; 로 변환됨 : 에러 발생 => while 변경
+  2. 변환할 내용이 없으면 리턴값이 undefined
+
+  if (regex.test(str)) {
+    return str.replace(regex, (matched) => chars[matched] || matched)
+  }
+  */
+
+  while (regex.test(str)) {
+    str = str.replace(regex, (matched) => chars[matched] || matched);
+  }
+  return str
+}
+
+export const isNullOrUndefined = (value) => {
+  return value === null || value === undefined
+}
+
+export const isEqualObjects = (obj1, obj2) => {
+  const keys1 = Object.keys(obj1)
+  const keys2 = Object.keys(obj2)
+
+  if (keys1.length !== keys2.length) return false
+
+  for (let key of keys1) {
+    const val1 = obj1[key]
+    const val2 = obj2[key]
+    const areObjects = isObject(val1) && isObject(val2)
+
+    if (areObjects && !deepEqual(val1, val2)) return false
+    if (!areObjects && val1 !== val2) return false
+  }
+
+  return true
+}
+
+function isObject(value) {
+  return value !== null && typeof value === 'object'
+}