diff --git a/src/app/api/survey-sales/[id]/route.ts b/src/app/api/survey-sales/[id]/route.ts
index 5e4b83e..4794a5f 100644
--- a/src/app/api/survey-sales/[id]/route.ts
+++ b/src/app/api/survey-sales/[id]/route.ts
@@ -3,10 +3,10 @@ import { NextResponse } from 'next/server'
export async function GET(request: Request, context: { params: { id: string } }) {
const { id } = await context.params
// @ts-ignore
- const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.findUnique({
- where: { id: Number(id) },
+ const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.findUnique({
+ where: { ID: Number(id) },
include: {
- detail_info: true,
+ DETAIL_INFO: true,
},
})
return NextResponse.json(survey)
@@ -17,8 +17,8 @@ export async function PUT(request: Request, context: { params: { id: string } })
const body = await request.json()
try {
// @ts-ignore
- const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.update({
- where: { id: Number(id) },
+ const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
+ where: { ID: Number(id) },
data: {
...body,
},
@@ -37,22 +37,22 @@ export async function DELETE(request: Request, context: { params: { id: string }
//@ts-ignore
await prisma.$transaction(async (tx) => {
// @ts-ignore
- const detailData = await tx.SD_SERVEY_SALES_BASIC_INFO.findUnique({
- where: { id: Number(id) },
+ const detailData = await tx.SD_SURVEY_SALES_BASIC_INFO.findUnique({
+ where: { ID: Number(id) },
select: {
- detail_info: true,
+ DETAIL_INFO: true,
},
})
console.log('detailData:: ', detailData)
- if (detailData?.detail_info?.id) {
+ if (detailData?.DETAIL_INFO?.ID) {
// @ts-ignore
- await tx.SD_SERVEY_SALES_DETAIL_INFO.delete({
- where: { id: Number(detailData?.detail_info?.id) },
+ await tx.SD_SURVEY_SALES_DETAIL_INFO.delete({
+ where: { ID: Number(detailData?.DETAIL_INFO?.ID) },
})
}
// @ts-ignore
- await tx.SD_SERVEY_SALES_BASIC_INFO.delete({
- where: { id: Number(id) },
+ await tx.SD_SURVEY_SALES_BASIC_INFO.delete({
+ where: { ID: Number(id) },
})
})
return NextResponse.json({ message: 'Survey deleted successfully' })
@@ -65,43 +65,46 @@ export async function DELETE(request: Request, context: { params: { id: string }
export async function PATCH(request: Request, context: { params: { id: string } }) {
const { id } = await context.params
const body = await request.json()
+
if (body.submit) {
// @ts-ignore
- const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.update({
- where: { id: Number(id) },
+ const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
+ where: { ID: Number(id) },
data: {
- submission_status: true,
- submission_date: new Date(),
+ SUBMISSION_STATUS: true,
+ SUBMISSION_DATE: new Date(),
},
})
return NextResponse.json({ message: 'Survey confirmed successfully' })
} else {
// @ts-ignore
- const hasDetails = await prisma.SD_SERVEY_SALES_DETAIL_INFO.findUnique({
- where: { basic_info_id: Number(id) },
+ const hasDetails = await prisma.SD_SURVEY_SALES_DETAIL_INFO.findUnique({
+ where: { BASIC_INFO_ID: Number(id) },
})
+ console.log('hasDetails:: ', hasDetails)
if (hasDetails) {
//@ts-ignore
- const result = await prisma.SD_SERVEY_SALES_BASIC_INFO.update({
- where: { id: Number(id) },
+ const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
+ where: { ID: Number(id) },
data: {
- updated_at: new Date(),
- detail_info: {
- update: body.detail_info,
+ UPT_DT: new Date(),
+ DETAIL_INFO: {
+ update: body.DETAIL_INFO,
},
},
})
return NextResponse.json(result)
} else {
// @ts-ignore
- const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.update({
- where: { id: Number(id) },
+ const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
+ where: { ID: Number(id) },
data: {
- detail_info: {
- create: body.detail_info,
+ DETAIL_INFO: {
+ create: body.DETAIL_INFO,
},
},
})
+ console.log(survey)
return NextResponse.json({ message: 'Survey detail created successfully' })
}
}
diff --git a/src/app/api/survey-sales/route.ts b/src/app/api/survey-sales/route.ts
index 8c32ca6..ce6ce6f 100644
--- a/src/app/api/survey-sales/route.ts
+++ b/src/app/api/survey-sales/route.ts
@@ -4,7 +4,7 @@ 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({
+ const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({
data: body,
})
return NextResponse.json(res)
@@ -20,12 +20,12 @@ export async function GET(request: Request) {
const store = searchParams.get('store')
const construction_point = searchParams.get('construction_point')
- const searchOptions = ['building_name', 'representative', 'store', 'construction_point', 'customer_name', 'post_code', 'address', 'address_detail']
+ const searchOptions = ['BUILDING_NAME', 'REPRESENTATIVE', 'STORE', 'CONSTRUCTION_POINT', 'CUSTOMER_NAME', 'POST_CODE', 'ADDRESS', 'ADDRESS_DETAIL']
try {
const where: any = {}
if (isMySurvey !== null && isMySurvey !== undefined) {
- where.representative = isMySurvey
+ where.REPRESENTATIVE = isMySurvey
}
if (keyword && keyword.trim() !== '' && searchOption) {
@@ -33,7 +33,7 @@ export async function GET(request: Request) {
where.OR = []
if (keyword.match(/^\d+$/) || !isNaN(Number(keyword))) {
where.OR.push({
- id: {
+ ID: {
equals: Number(keyword),
},
})
@@ -59,14 +59,14 @@ export async function GET(request: Request) {
where.AND = []
if (store) {
where.AND.push({
- store: {
+ STORE: {
equals: store,
},
})
}
if (construction_point) {
where.AND.push({
- construction_point: {
+ CONSTRUCTION_POINT: {
equals: construction_point,
},
})
@@ -74,16 +74,16 @@ export async function GET(request: Request) {
if (offset) {
// @ts-ignore
- const res = await prisma.SD_SERVEY_SALES_BASIC_INFO.findMany({
+ const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.findMany({
where,
- orderBy: sort === 'created' ? { created_at: 'desc' } : { updated_at: 'desc' },
+ orderBy: sort === 'created' ? { REG_DT: 'desc' } : { UPT_DT: 'desc' },
skip: Number(offset),
take: 10,
})
return NextResponse.json(res)
} else {
// @ts-ignore
- const count = await prisma.SD_SERVEY_SALES_BASIC_INFO.count({
+ const count = await prisma.SD_SURVEY_SALES_BASIC_INFO.count({
where,
})
return NextResponse.json(count)
@@ -96,9 +96,9 @@ export async function GET(request: Request) {
export async function PUT(request: Request) {
const body = await request.json()
- const detailInfo = { ...body.detail_info, basic_info_id: body.id }
+ const detailInfo = { ...body.detail_info, BASIC_INFO_ID: body.id }
// @ts-ignore
- const res = await prisma.SD_SERVEY_SALES_DETAIL_INFO.create({
+ const res = await prisma.SD_SURVEY_SALES_DETAIL_INFO.create({
data: detailInfo,
})
return NextResponse.json({ message: 'Survey sales updated successfully' })
diff --git a/src/components/survey-sale/detail/DataTable.tsx b/src/components/survey-sale/detail/DataTable.tsx
index 6446be7..2ec528e 100644
--- a/src/components/survey-sale/detail/DataTable.tsx
+++ b/src/components/survey-sale/detail/DataTable.tsx
@@ -20,7 +20,7 @@ export default function DataTable() {
const { setBasicInfoSelected, setRoofInfoSelected } = useSurveySaleTabState()
useEffect(() => {
- if (surveyDetail?.representative && surveyDetail?.store && surveyDetail?.construction_point) {
+ if (surveyDetail?.REPRESENTATIVE && surveyDetail?.STORE && surveyDetail?.CONSTRUCTION_POINT) {
setIsTemporary(false)
}
if (tab === 'roof-info') {
@@ -50,24 +50,24 @@ export default function DataTable() {
仮保存
) : (
-
| 提出可否 |
- {surveyDetail?.submission_status && surveyDetail?.submission_date ? (
+ {surveyDetail?.SUBMISSION_STATUS && surveyDetail?.SUBMISSION_DATE ? (
<>
{/* TODO: 제출한 판매점 ID 추가 필요 */}
- {new Date(surveyDetail.submission_date).toLocaleString()}
+ {new Date(surveyDetail.SUBMISSION_DATE).toLocaleString()}
販売店 ID...
>
) : (
diff --git a/src/components/survey-sale/detail/DetailForm.tsx b/src/components/survey-sale/detail/DetailForm.tsx
index 31c33bb..469c465 100644
--- a/src/components/survey-sale/detail/DetailForm.tsx
+++ b/src/components/survey-sale/detail/DetailForm.tsx
@@ -14,7 +14,7 @@ export default function DetailForm({
const [isTemporary, setIsTemporary] = useState(true)
useEffect(() => {
- if (surveyDetail?.representative && surveyDetail?.store && surveyDetail?.construction_point) {
+ if (surveyDetail?.REPRESENTATIVE && surveyDetail?.STORE && surveyDetail?.CONSTRUCTION_POINT) {
setIsTemporary(false)
}
}, [surveyDetail])
@@ -28,15 +28,15 @@ export default function DetailForm({
@@ -45,18 +45,18 @@ export default function DetailForm({
-
+
>
)
diff --git a/src/components/survey-sale/detail/RoofDetailForm.tsx b/src/components/survey-sale/detail/RoofDetailForm.tsx
index 0291f9c..a20f48a 100644
--- a/src/components/survey-sale/detail/RoofDetailForm.tsx
+++ b/src/components/survey-sale/detail/RoofDetailForm.tsx
@@ -30,12 +30,12 @@ export default function RoofDetailForm({
{/* 전기 소매 회사 */}
{/* 전기 부대 설비 */}
@@ -46,7 +46,7 @@ export default function RoofDetailForm({
@@ -56,7 +56,7 @@ export default function RoofDetailForm({
@@ -68,19 +68,19 @@ export default function RoofDetailForm({
className="input-frame"
placeholder="-"
readOnly
- value={surveyDetail?.detail_info?.supplementary_facilities_etc ?? ''}
+ value={surveyDetail?.DETAIL_INFO?.SUPPLEMENTARY_FACILITIES_ETC ?? ''}
/>
{/* 설치 희망 시스템 */}
{/* 건축 연수 */}
{/* 지붕재 */}
@@ -91,63 +91,63 @@ export default function RoofDetailForm({
))}
-
+
-
+
{/* 지붕 모양 */}
{/* 지붕 경사도 */}
{/* 주택 구조 */}
{/* 서까래 재질 */}
{/* 서까래 크기 */}
{/* 서까래 피치 */}
{/* 서까래 방향 */}
{/* 노지판 종류 */}
{/* 노지판 두께 */}
@@ -158,7 +158,7 @@ export default function RoofDetailForm({
type="text"
placeholder="-"
readOnly
- value={surveyDetail?.detail_info?.open_field_plate_thickness ?? ''}
+ value={surveyDetail?.DETAIL_INFO?.OPEN_FIELD_PLATE_THICKNESS ?? ''}
/>
mm
@@ -166,37 +166,37 @@ export default function RoofDetailForm({
{/* 누수 흔적 */}
{/* 방수재 종류 */}
{/* 단열재 유무 */}
{/* 구조 순서 */}
{/* 설치 가능 여부 */}
{/* 메모 */}
-
+
>
)
@@ -204,16 +204,14 @@ export default function RoofDetailForm({
const SelectedBox = ({ column, detailInfoData }: { column: string; detailInfoData: SurveyDetailInfo | null }) => {
const selectedId = detailInfoData?.[column as keyof SurveyDetailInfo]
- const etcValue = detailInfoData?.[`${column}_etc` as keyof SurveyDetailInfo]
+ const etcValue = detailInfoData?.[`${column}_ETC` as keyof SurveyDetailInfo]
return (
<>
{etcValue && }
>
@@ -222,28 +220,30 @@ const SelectedBox = ({ column, detailInfoData }: { column: string; detailInfoDat
const RadioSelected = ({ column, detailInfoData }: { column: string; detailInfoData: SurveyDetailInfo | null }) => {
let selectedId = detailInfoData?.[column as keyof SurveyDetailInfo]
- if (column === 'leak_trace') {
+ if (column === 'LEAK_TRACE') {
selectedId = Number(selectedId)
+ if (!selectedId) selectedId = 2
}
-
+
let etcValue = null
- if (column !== 'rafter_direction') {
- etcValue = detailInfoData?.[`${column}_etc` as keyof SurveyDetailInfo]
+ if (column !== 'RAFTER_DIRECTION') {
+ 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) => (
-
+
))}
- {column !== 'rafter_direction' && column !== 'leak_trace' && column !== 'insulation_presence' && (
+ {column !== 'RAFTER_DIRECTION' && column !== 'LEAK_TRACE' && column !== 'INSULATION_PRESENCE' && (
-
-
+
+
)}
{etcChecked && (
diff --git a/src/components/survey-sale/detail/form/BasicForm.tsx b/src/components/survey-sale/detail/form/BasicForm.tsx
index 2386e20..6ed3d28 100644
--- a/src/components/survey-sale/detail/form/BasicForm.tsx
+++ b/src/components/survey-sale/detail/form/BasicForm.tsx
@@ -11,20 +11,20 @@ import { useSessionStore } from '@/store/session'
import { useUserType } from '@/hooks/useUserType'
const defaultBasicInfoForm: SurveyBasicRequest = {
- representative: '',
- store: null,
- construction_point: null,
- investigation_date: new Date().toLocaleDateString('en-CA'),
- building_name: null,
- customer_name: null,
- post_code: null,
- address: null,
- address_detail: null,
- submission_status: false,
- submission_date: null,
+ REPRESENTATIVE: '',
+ STORE: null,
+ CONSTRUCTION_POINT: null,
+ INVESTIGATION_DATE: new Date().toLocaleDateString('en-CA'),
+ BUILDING_NAME: null,
+ CUSTOMER_NAME: null,
+ POST_CODE: null,
+ ADDRESS: null,
+ ADDRESS_DETAIL: null,
+ SUBMISSION_STATUS: false,
+ SUBMISSION_DATE: null,
}
-const REQUIRED_FIELDS: (keyof SurveyBasicRequest)[] = ['representative', 'building_name', 'customer_name']
+const REQUIRED_FIELDS: (keyof SurveyBasicRequest)[] = ['REPRESENTATIVE', 'BUILDING_NAME', 'CUSTOMER_NAME']
export default function BasicForm() {
const searchParams = useSearchParams()
@@ -44,21 +44,21 @@ export default function BasicForm() {
useEffect(() => {
if (surveyDetail) {
- const { id, updated_at, created_at, detail_info, ...rest } = surveyDetail
+ const { ID, UPT_DT, REG_DT, DETAIL_INFO, ...rest } = surveyDetail
setBasicInfoData(rest)
}
if (addressData) {
setBasicInfoData({
...basicInfoData,
- post_code: addressData.post_code,
- address: addressData.address,
- address_detail: addressData.address_detail,
+ POST_CODE: addressData.post_code,
+ ADDRESS: addressData.address,
+ ADDRESS_DETAIL: addressData.address_detail,
})
}
if (session?.isLoggedIn) {
setBasicInfoData((prev) => ({
...prev,
- representative: session?.userNm ?? '',
+ REPRESENTATIVE: session?.userNm ?? '',
}))
}
setBasicInfoSelected()
@@ -117,8 +117,8 @@ export default function BasicForm() {
type="text"
className="input-frame"
id="representative"
- value={session?.userNm ? session?.userNm : basicInfoData.representative}
- onChange={(e) => handleChange('representative', e.target.value)}
+ value={session?.userNm ? session?.userNm : basicInfoData.REPRESENTATIVE}
+ onChange={(e) => handleChange('REPRESENTATIVE', e.target.value)}
/>
{(userType === 'order' || userType?.includes('musubi')) && (
@@ -129,8 +129,8 @@ export default function BasicForm() {
type="text"
className="input-frame"
id="store"
- value={store ? store : basicInfoData.store ?? ''}
- onChange={(e) => handleChange('store', e.target.value)}
+ value={store ? store : basicInfoData.STORE ?? ''}
+ onChange={(e) => handleChange('STORE', e.target.value)}
/>
>
@@ -142,8 +142,8 @@ export default function BasicForm() {
type="text"
className="input-frame"
id="construction_point"
- value={construction_point ? construction_point : basicInfoData.construction_point ?? ''}
- onChange={(e) => handleChange('construction_point', e.target.value)}
+ value={construction_point ? construction_point : basicInfoData.CONSTRUCTION_POINT ?? ''}
+ onChange={(e) => handleChange('CONSTRUCTION_POINT', e.target.value)}
/>
)}
@@ -161,9 +161,9 @@ export default function BasicForm() {
handleChange('investigation_date', e.target.value)}
+ id="INVESTIGATION_DATE"
+ value={basicInfoData.INVESTIGATION_DATE ?? ''}
+ onChange={(e) => handleChange('INVESTIGATION_DATE', e.target.value)}
/>
@@ -172,9 +172,9 @@ export default function BasicForm() {
handleChange('building_name', e.target.value)}
+ id="BUILDING_NAME"
+ value={basicInfoData.BUILDING_NAME ?? ''}
+ onChange={(e) => handleChange('BUILDING_NAME', e.target.value)}
/>
@@ -182,24 +182,24 @@ export default function BasicForm() {
handleChange('customer_name', e.target.value)}
+ id="CUSTOMER_NAME"
+ value={basicInfoData.CUSTOMER_NAME ?? ''}
+ onChange={(e) => handleChange('CUSTOMER_NAME', e.target.value)}
/>
建物の住所
diff --git a/src/components/survey-sale/detail/form/MultiCheckEtc.tsx b/src/components/survey-sale/detail/form/MultiCheckEtc.tsx
index 637d202..30a1ca7 100644
--- a/src/components/survey-sale/detail/form/MultiCheckEtc.tsx
+++ b/src/components/survey-sale/detail/form/MultiCheckEtc.tsx
@@ -24,7 +24,7 @@ export default function MultiCheckbox({
setDetailInfoData: (data: any) => void
detailInfoData: SurveyDetailRequest
}) {
- const selectList = column === 'supplementary_facilities' ? supplementary_facilities : roof_material
+ const selectList = column === 'SUPPLEMENTARY_FACILITIES' ? supplementary_facilities : roof_material
const [isOtherChecked, setIsOtherChecked] = useState(false)
const [otherValue, setOtherValue] = useState('')
@@ -37,9 +37,9 @@ export default function MultiCheckbox({
}
useEffect(() => {
- if (detailInfoData[`${column}_etc` as keyof SurveyDetailRequest]) {
+ if (detailInfoData[`${column}_ETC` as keyof SurveyDetailRequest]) {
setIsOtherChecked(true)
- setOtherValue(detailInfoData[`${column}_etc` as keyof SurveyDetailRequest] as string)
+ setOtherValue(detailInfoData[`${column}_ETC` as keyof SurveyDetailRequest] as string)
}
}, [detailInfoData])
@@ -52,7 +52,7 @@ export default function MultiCheckbox({
newValue = value.filter((v) => v !== String(dataIndex))
} else {
// 체크
- if (column === 'roof_material') {
+ if (column === 'ROOF_MATERIAL') {
// 기타가 체크되어 있는지 확인
const isOtherSelected = isOtherChecked
// 현재 선택된 항목 수 + 기타 선택 여부
@@ -73,27 +73,23 @@ export default function MultiCheckbox({
}
const handleOtherCheckbox = () => {
- if (column === 'roof_material') {
+ if (column === 'ROOF_MATERIAL') {
const value = makeNumArr(String(detailInfoData[column as keyof SurveyDetailRequest] ?? ''))
- // 현재 선택된 항목 수
const currentSelected = value.length
-
if (!isOtherChecked && currentSelected >= 2) {
alert('Up to two roofing materials can be selected.')
return
}
}
- setIsOtherChecked(!isOtherChecked)
- if (!isOtherChecked) {
- setOtherValue('')
- setDetailInfoData({
- ...detailInfoData,
- [`${column}_etc`]: null,
- })
- } else {
- setOtherValue('')
- }
+ const newIsOtherChecked = !isOtherChecked
+ setIsOtherChecked(newIsOtherChecked)
+ setOtherValue('')
+
+ setDetailInfoData({
+ ...detailInfoData,
+ [`${column}_ETC`]: newIsOtherChecked ? '' : null,
+ })
}
const handleOtherInputChange = (e: React.ChangeEvent ) => {
@@ -101,13 +97,13 @@ export default function MultiCheckbox({
setOtherValue(value)
setDetailInfoData({
...detailInfoData,
- [`${column}_etc`]: value,
+ [`${column}_ETC`]: value,
})
}
return (
<>
- {column === 'supplementary_facilities' ? (
+ {column === 'SUPPLEMENTARY_FACILITIES' ? (
<>
電気袋設備※複数選択可能
diff --git a/src/components/survey-sale/detail/form/RadioEtc.tsx b/src/components/survey-sale/detail/form/RadioEtc.tsx
index ea9eabc..29f3325 100644
--- a/src/components/survey-sale/detail/form/RadioEtc.tsx
+++ b/src/components/survey-sale/detail/form/RadioEtc.tsx
@@ -2,25 +2,25 @@
import { useEffect, useState } from 'react'
import { SurveyDetailRequest } from '@/types/Survey'
-type RadioEtcKeys = 'house_structure' | 'rafter_material' | 'waterproof_material' | 'insulation_presence' | 'rafter_direction' | 'leak_trace'
+type RadioEtcKeys = 'HOUSE_STRUCTURE' | 'RAFTER_MATERIAL' | 'WATERPROOF_MATERIAL' | 'INSULATION_PRESENCE' | 'RAFTER_DIRECTION' | 'LEAK_TRACE'
const translateJapanese: Record = {
- house_structure: '住宅構造',
- rafter_material: '垂木材質',
- waterproof_material: '防水材の種類',
- insulation_presence: '断熱材の有無',
- rafter_direction: '垂木の方向',
- leak_trace: '水漏れの痕跡',
+ HOUSE_STRUCTURE: '住宅構造',
+ RAFTER_MATERIAL: '垂木材質',
+ WATERPROOF_MATERIAL: '防水材の種類',
+ INSULATION_PRESENCE: '断熱材の有無',
+ RAFTER_DIRECTION: '垂木の方向',
+ LEAK_TRACE: '水漏れの痕跡',
}
export const radioEtcData: Record = {
- house_structure: [
+ HOUSE_STRUCTURE: [
{
id: 1,
label: '木製',
},
],
- rafter_material: [
+ RAFTER_MATERIAL: [
{
id: 1,
label: '木製',
@@ -30,13 +30,13 @@ export const radioEtcData: Record
label: '強制',
},
],
- waterproof_material: [
+ WATERPROOF_MATERIAL: [
{
id: 1,
label: 'アスファルト屋根940(22kg以上)',
},
],
- insulation_presence: [
+ INSULATION_PRESENCE: [
{
id: 1,
label: 'なし',
@@ -46,7 +46,7 @@ export const radioEtcData: Record
label: 'あり',
},
],
- rafter_direction: [
+ RAFTER_DIRECTION: [
{
id: 1,
label: '垂直垂木',
@@ -56,7 +56,7 @@ export const radioEtcData: Record
label: '水平垂木',
},
],
- leak_trace: [
+ LEAK_TRACE: [
{
id: 1,
label: 'あり',
@@ -81,35 +81,53 @@ export default function RadioEtc({
const [etcValue, setEtcValue] = useState('')
useEffect(() => {
- if (detailInfoData[`${column}_etc` as keyof SurveyDetailRequest]) {
+ if (detailInfoData[`${column}_ETC` as keyof SurveyDetailRequest]) {
setIsEtcSelected(true)
- setEtcValue(detailInfoData[`${column}_etc` as keyof SurveyDetailRequest] as string)
+ setEtcValue(detailInfoData[`${column}_ETC` as keyof SurveyDetailRequest] as string)
}
}, [detailInfoData])
const handleRadioChange = (e: React.ChangeEvent) => {
+ // const value = e.target.value
+ // if (column === 'INSULATION_PRESENCE') {
+ // setIsEtcSelected(value === '2')
+ // setDetailInfoData({
+ // ...detailInfoData,
+ // [column]: value,
+ // })
+ // } else if (value === 'etc') {
+ // setIsEtcSelected(true)
+ // setDetailInfoData({
+ // ...detailInfoData,
+ // [column]: null,
+ // })
+ // } else {
+ // setIsEtcSelected(false)
+ // setEtcValue('')
+ // setDetailInfoData({
+ // ...detailInfoData,
+ // [column]: value,
+ // [`${column}_ETC`]: null,
+ // })
+ // }
const value = e.target.value
- if (column === 'insulation_presence') {
- setIsEtcSelected(value === '2')
- setDetailInfoData({
- ...detailInfoData,
- [column]: Number(value),
- })
- } else if (value === 'etc') {
- setIsEtcSelected(true)
- setDetailInfoData({
- ...detailInfoData,
- [column]: null,
- })
- } else {
- setIsEtcSelected(false)
- setEtcValue('')
- setDetailInfoData({
- ...detailInfoData,
- [column]: Number(value),
- [`${column}_etc`]: null,
- })
+ const isSpecialCase = column === 'INSULATION_PRESENCE'
+ const isEtc = value === 'etc'
+ const isSpecialEtc = isSpecialCase && value === '2'
+
+ const updatedData: typeof detailInfoData = {
+ ...detailInfoData,
+ [column]: isEtc ? null : value,
+ [`${column}_ETC`]: isEtc ? '' : null,
}
+
+ if (isSpecialEtc) {
+ updatedData[column] = value
+ }
+
+ setIsEtcSelected(isEtc || isSpecialEtc)
+ if (!isEtc) setEtcValue('')
+ setDetailInfoData(updatedData)
}
const handleEtcInputChange = (e: React.ChangeEvent) => {
@@ -117,7 +135,7 @@ export default function RadioEtc({
setEtcValue(value)
setDetailInfoData({
...detailInfoData,
- [`${column}_etc`]: value,
+ [`${column}_ETC`]: value,
})
}
@@ -130,24 +148,24 @@ export default function RadioEtc({
type="radio"
name={column}
id={`${column}_${item.id}`}
- value={item.id}
+ value={item.id.toString()}
onChange={handleRadioChange}
- checked={detailInfoData[column] === item.id}
+ checked={detailInfoData[column] === item.id.toString()}
/>
))}
- {column !== 'insulation_presence' && (
+ {column !== 'INSULATION_PRESENCE' && (
-
-
+
+
)}
diff --git a/src/components/survey-sale/detail/form/RoofInfoForm.tsx b/src/components/survey-sale/detail/form/RoofInfoForm.tsx
index 173c18a..582a423 100644
--- a/src/components/survey-sale/detail/form/RoofInfoForm.tsx
+++ b/src/components/survey-sale/detail/form/RoofInfoForm.tsx
@@ -11,41 +11,41 @@ import SelectBoxEtc from './SelectBoxEtc'
import RadioEtc from './RadioEtc'
const defaultDetailInfoForm: SurveyDetailRequest = {
- contract_capacity: null,
- retail_company: null,
- supplementary_facilities: null,
- supplementary_facilities_etc: null,
- installation_system: null,
- installation_system_etc: null,
- construction_year: null,
- construction_year_etc: null,
- roof_material: null,
- roof_material_etc: null,
- roof_shape: null,
- roof_shape_etc: null,
- roof_slope: null,
- house_structure: 1,
- house_structure_etc: null,
- rafter_material: 1,
- rafter_material_etc: null,
- rafter_size: null,
- rafter_size_etc: null,
- rafter_pitch: null,
- rafter_pitch_etc: null,
- rafter_direction: 1,
- open_field_plate_kind: null,
- open_field_plate_kind_etc: null,
- open_field_plate_thickness: null,
- leak_trace: false,
- waterproof_material: null,
- waterproof_material_etc: null,
- insulation_presence: 1,
- insulation_presence_etc: null,
- structure_order: null,
- structure_order_etc: null,
- installation_availability: null,
- installation_availability_etc: null,
- memo: null,
+ CONTRACT_CAPACITY: null,
+ RETAIL_COMPANY: null,
+ SUPPLEMENTARY_FACILITIES: null,
+ SUPPLEMENTARY_FACILITIES_ETC: null,
+ INSTALLATION_SYSTEM: null,
+ INSTALLATION_SYSTEM_ETC: null,
+ CONSTRUCTION_YEAR: null,
+ CONSTRUCTION_YEAR_ETC: null,
+ ROOF_MATERIAL: null,
+ ROOF_MATERIAL_ETC: null,
+ ROOF_SHAPE: null,
+ ROOF_SHAPE_ETC: null,
+ ROOF_SLOPE: null,
+ HOUSE_STRUCTURE: '1',
+ HOUSE_STRUCTURE_ETC: null,
+ RAFTER_MATERIAL: '1',
+ RAFTER_MATERIAL_ETC: null,
+ RAFTER_SIZE: null,
+ RAFTER_SIZE_ETC: null,
+ RAFTER_PITCH: null,
+ RAFTER_PITCH_ETC: null,
+ RAFTER_DIRECTION: '1',
+ OPEN_FIELD_PLATE_KIND: null,
+ OPEN_FIELD_PLATE_KIND_ETC: null,
+ OPEN_FIELD_PLATE_THICKNESS: null,
+ LEAK_TRACE: false,
+ WATERPROOF_MATERIAL: null,
+ WATERPROOF_MATERIAL_ETC: null,
+ INSULATION_PRESENCE: '1',
+ INSULATION_PRESENCE_ETC: null,
+ STRUCTURE_ORDER: null,
+ STRUCTURE_ORDER_ETC: null,
+ INSTALLATION_AVAILABILITY: null,
+ INSTALLATION_AVAILABILITY_ETC: null,
+ MEMO: null,
}
export default function RoofInfoForm() {
@@ -64,14 +64,14 @@ export default function RoofInfoForm() {
const [detailInfoData, setDetailInfoData] = useState(defaultDetailInfoForm)
useEffect(() => {
- if (surveyDetail?.detail_info) {
- const { id, updated_at, created_at, basic_info_id, ...rest } = surveyDetail.detail_info
+ if (surveyDetail?.DETAIL_INFO) {
+ const { ID, UPT_DT, REG_DT, BASIC_INFO_ID, ...rest } = surveyDetail.DETAIL_INFO
setDetailInfoData(rest)
}
}, [surveyDetail])
const handleNumberInput = (key: keyof SurveyDetailRequest, value: number | string) => {
- if (key === 'roof_slope' || key === 'open_field_plate_thickness') {
+ if (key === 'ROOF_SLOPE' || key === 'OPEN_FIELD_PLATE_THICKNESS') {
const stringValue = value.toString()
if (stringValue.length > 5) {
alert('保存できるサイズを超えました。')
@@ -86,7 +86,7 @@ export default function RoofInfoForm() {
}
setDetailInfoData({ ...detailInfoData, [key]: value.toString() })
} else {
- setDetailInfoData({ ...detailInfoData, [key]: value })
+ setDetailInfoData({ ...detailInfoData, [key]: value.toString() })
}
}
@@ -99,19 +99,20 @@ export default function RoofInfoForm() {
}
const handleUnitInput = (value: string) => {
- const numericValue = detailInfoData.contract_capacity?.replace(/[^0-9.]/g, '') || ''
+ const numericValue = detailInfoData.CONTRACT_CAPACITY?.replace(/[^0-9.]/g, '') || ''
setDetailInfoData({
...detailInfoData,
- contract_capacity: numericValue ? `${numericValue} ${value}` : value,
+ CONTRACT_CAPACITY: numericValue ? `${numericValue} ${value}` : value,
})
}
const handleSave = async () => {
+ console.log(detailInfoData)
if (id) {
const emptyField = validateSurveyDetail(detailInfoData)
if (emptyField.trim() === '') {
const updatedBasicInfoData = {
- detail_info: detailInfoData,
+ DETAIL_INFO: detailInfoData,
}
try {
createSurveyDetail({
@@ -151,17 +152,17 @@ export default function RoofInfoForm() {
type="number"
inputMode="decimal"
className="input-frame"
- value={detailInfoData.contract_capacity?.split(' ')[0] ?? ''}
- onChange={(e) => handleNumberInput('contract_capacity', e.target.value)}
+ value={detailInfoData.CONTRACT_CAPACITY?.split(' ')[0] ?? ''}
+ onChange={(e) => handleNumberInput('CONTRACT_CAPACITY', e.target.value)}
/>
{/* 전기 부대 설비 - supplementary_facilities */}
-
+
{/* 설치 희망 시스템 - installation_system */}
-
+
@@ -194,13 +195,13 @@ export default function RoofInfoForm() {
屋根関係
{/* 건축 연수 - construction_year */}
-
+
{/* 지붕재 - roof_material */}
-
+
{/* 지붕 모양 - roof_shape */}
-
+
{/* 지붕 경사도 - roof_slope */}
屋根の斜面
@@ -210,20 +211,20 @@ export default function RoofInfoForm() {
step={0.1}
inputMode="decimal"
className="input-frame"
- value={detailInfoData.roof_slope ?? ''}
- onChange={(e) => handleNumberInput('roof_slope', e.target.value)}
+ value={detailInfoData.ROOF_SLOPE ?? ''}
+ onChange={(e) => handleNumberInput('ROOF_SLOPE', e.target.value)}
/>
寸
{/* 주택 구조 - house_structure */}
-
+
{/* 서까래 재질 - rafter_material */}
-
+
{/* 서까래 크기 - rafter_size */}
-
+
{/* 서까래 피치 - rafter_pitch */}
-
+
{/* 서까래 방향 - rafter_direction */}
{/* 노지판 종류 - open_field_plate_kind */}
-
+
{/* 노지판 두께 - open_field_plate_thickness */}
@@ -265,8 +266,8 @@ export default function RoofInfoForm() {
step={0.1}
inputMode="decimal"
className="input-frame"
- value={detailInfoData.open_field_plate_thickness ?? ''}
- onChange={(e) => handleNumberInput('open_field_plate_thickness', e.target.value)}
+ value={detailInfoData.OPEN_FIELD_PLATE_THICKNESS ?? ''}
+ onChange={(e) => handleNumberInput('OPEN_FIELD_PLATE_THICKNESS', e.target.value)}
/>
mm
@@ -278,33 +279,33 @@ export default function RoofInfoForm() {
handleBooleanInput('leak_trace', true)}
+ name="LEAK_TRACE"
+ id="LEAK_TRACE_1"
+ checked={detailInfoData.LEAK_TRACE === true}
+ onChange={(e) => handleBooleanInput('LEAK_TRACE', true)}
/>
-
+
handleBooleanInput('leak_trace', false)}
+ name="LEAK_TRACE"
+ id="LEAK_TRACE_2"
+ checked={detailInfoData.LEAK_TRACE === false}
+ onChange={(e) => handleBooleanInput('LEAK_TRACE', false)}
/>
-
+
{/* 방수재 종류 - waterproof_material */}
-
+
{/* 단열재 유무 - insulation_presence */}
-
+
{/* 노지판 종류 - open_field_plate_kind */}
-
+
{/* 설치 가능 여부 - installation_availability */}
-
+
{/* 메모 - memo */}
メモ
@@ -320,10 +321,10 @@ export default function RoofInfoForm() {
diff --git a/src/components/survey-sale/detail/form/SelectBoxEtc.tsx b/src/components/survey-sale/detail/form/SelectBoxEtc.tsx
index d1f1950..9469a40 100644
--- a/src/components/survey-sale/detail/form/SelectBoxEtc.tsx
+++ b/src/components/survey-sale/detail/form/SelectBoxEtc.tsx
@@ -2,39 +2,39 @@ import type { SurveyDetailRequest } from '@/types/Survey'
import { useEffect, useState } from 'react'
export type SelectBoxKeys =
- | 'installation_system'
- | 'construction_year'
- | 'roof_shape'
- | 'rafter_pitch'
- | 'rafter_size'
- | 'open_field_plate_kind'
- | 'structure_order'
- | 'installation_availability'
+ | 'INSTALLATION_SYSTEM'
+ | 'CONSTRUCTION_YEAR'
+ | 'ROOF_SHAPE'
+ | 'RAFTER_PITCH'
+ | 'RAFTER_SIZE'
+ | 'OPEN_FIELD_PLATE_KIND'
+ | 'STRUCTURE_ORDER'
+ | 'INSTALLATION_AVAILABILITY'
const font: Record = {
- installation_system: 'data-input-form-tit red-f',
- construction_year: 'data-input-form-tit red-f',
- roof_shape: 'data-input-form-tit',
- rafter_pitch: 'data-input-form-tit red-f',
- rafter_size: 'data-input-form-tit red-f',
- open_field_plate_kind: 'data-input-form-tit',
- structure_order: 'data-input-form-tit red-f',
- installation_availability: 'data-input-form-tit',
+ INSTALLATION_SYSTEM: 'data-input-form-tit red-f',
+ CONSTRUCTION_YEAR: 'data-input-form-tit red-f',
+ ROOF_SHAPE: 'data-input-form-tit',
+ RAFTER_PITCH: 'data-input-form-tit red-f',
+ RAFTER_SIZE: 'data-input-form-tit red-f',
+ OPEN_FIELD_PLATE_KIND: 'data-input-form-tit',
+ STRUCTURE_ORDER: 'data-input-form-tit red-f',
+ INSTALLATION_AVAILABILITY: 'data-input-form-tit',
}
const translateJapanese: Record = {
- installation_system: '設置希望システム',
- construction_year: '建築年数',
- roof_shape: '屋根の形状',
- rafter_pitch: '垂木傾斜',
- rafter_size: '垂木サイズ',
- open_field_plate_kind: '路地板の種類',
- structure_order: '屋根構造の順序',
- installation_availability: '屋根製品名 設置可否確認',
+ INSTALLATION_SYSTEM: '設置希望システム',
+ CONSTRUCTION_YEAR: '建築年数',
+ ROOF_SHAPE: '屋根の形状',
+ RAFTER_PITCH: '垂木傾斜',
+ RAFTER_SIZE: '垂木サイズ',
+ OPEN_FIELD_PLATE_KIND: '路地板の種類',
+ STRUCTURE_ORDER: '屋根構造の順序',
+ INSTALLATION_AVAILABILITY: '屋根製品名 設置可否確認',
}
export const selectBoxOptions: Record = {
- installation_system: [
+ INSTALLATION_SYSTEM: [
{
id: 1,
name: '太陽光発電', //태양광발전
@@ -48,7 +48,7 @@ export const selectBoxOptions: Record {
- if (detailInfoData[`${column}_etc` as keyof SurveyDetailRequest]) {
+ if (detailInfoData[`${column}_ETC` as keyof SurveyDetailRequest]) {
setIsEtcSelected(true)
- setEtcValue(detailInfoData[`${column}_etc` as keyof SurveyDetailRequest] as string)
+ setEtcValue(detailInfoData[`${column}_ETC` as keyof SurveyDetailRequest] as string)
}
}, [detailInfoData])
const handleSelectChange = (e: React.ChangeEvent) => {
const value = e.target.value
- if (column === 'installation_availability' || column === 'construction_year') {
- setIsEtcSelected(value === '2') // 건축 연수 & 설치 가능 여부 컬럼 2번 선택 시 input 활성화
- setDetailInfoData({
- ...detailInfoData,
- [column]: Number(value),
- })
- } else if (value === 'etc') {
- setIsEtcSelected(true) // 기타 선택 시 input 활성화
- setDetailInfoData({
- ...detailInfoData,
- [column]: null,
- })
- } else {
- setIsEtcSelected(false) // 기타 선택 해제 시 input 비활성화
- setEtcValue('')
- setDetailInfoData({
- ...detailInfoData,
- [`${column}_etc`]: null,
- [column]: Number(value),
- })
+ const isSpecialCase = column === 'CONSTRUCTION_YEAR' || column === 'INSTALLATION_AVAILABILITY'
+ const isEtc = value === 'etc'
+ const isSpecialEtc = isSpecialCase && value === '2'
+
+ const updatedData: typeof detailInfoData = {
+ ...detailInfoData,
+ [column]: isEtc ? null : value,
+ [`${column}_ETC`]: isEtc ? '' : null,
}
+
+ // 건축연수 + 설치가능여부는 2번 선택 시 input 활성화
+ if (isSpecialEtc) {
+ updatedData[column] = value
+ }
+
+ setIsEtcSelected(isEtc || isSpecialEtc)
+ if (!isEtc) setEtcValue('')
+ setDetailInfoData(updatedData)
}
const handleEtcInputChange = (e: React.ChangeEvent) => {
@@ -201,31 +198,31 @@ export default function SelectBoxForm({
setEtcValue(value)
setDetailInfoData({
...detailInfoData,
- [`${column}_etc`]: value,
+ [`${column}_ETC`]: value,
})
}
return (
<>
- {translateJapanese[column]}
+ {translateJapanese[column as keyof typeof translateJapanese]}
@@ -235,10 +232,10 @@ export default function SelectBoxForm({
value={etcValue ?? ''}
onChange={handleEtcInputChange}
disabled={
- column === 'installation_availability'
+ column === 'INSTALLATION_AVAILABILITY'
? !Boolean(detailInfoData[column])
- : column === 'construction_year'
- ? detailInfoData[column] !== 2 // 既築(2)가 아닐 때 비활성화
+ : column === 'CONSTRUCTION_YEAR'
+ ? detailInfoData[column] !== '2' // 既築(2)가 아닐 때 비활성화
: !isEtcSelected
}
/>
diff --git a/src/components/survey-sale/list/ListTable.tsx b/src/components/survey-sale/list/ListTable.tsx
index ade76f2..63eb41b 100644
--- a/src/components/survey-sale/list/ListTable.tsx
+++ b/src/components/survey-sale/list/ListTable.tsx
@@ -50,17 +50,17 @@ export default function ListTable() {
{heldSurveyList.map((survey) => (
- - handleDetailClick(survey.id)}>
+
- handleDetailClick(survey.ID)}>
- {survey.id}
- {survey.investigation_date}
+ {survey.ID}
+ {survey.INVESTIGATION_DATE}
- {survey.building_name}
- {survey.customer_name}
+ {survey.BUILDING_NAME}
+ {survey.CUSTOMER_NAME}
- {survey.representative}
- {new Date(survey.updated_at).toLocaleString()}
+ {survey.REPRESENTATIVE}
+ {new Date(survey.UPT_DT).toLocaleString()}
diff --git a/src/hooks/useSurvey.ts b/src/hooks/useSurvey.ts
index 9ab9b47..ea04db4 100644
--- a/src/hooks/useSurvey.ts
+++ b/src/hooks/useSurvey.ts
@@ -77,7 +77,7 @@ export function useServey(id?: number): {
const { mutateAsync: createSurvey, isPending: isCreatingSurvey } = useMutation({
mutationFn: async (survey: SurveyBasicRequest) => {
const resp = await axiosInstance(null).post('/api/survey-sales', survey)
- return resp.data.id ?? 0
+ return resp.data.ID ?? 0
},
onSuccess: (data) => {
queryClient.invalidateQueries({ queryKey: ['survey', 'list'] })
@@ -138,28 +138,29 @@ export function useServey(id?: number): {
const validateSurveyDetail = (surveyDetail: SurveyDetailRequest) => {
const requiredFields = [
- 'installation_system',
- 'construction_year',
- 'rafter_size',
- 'rafter_pitch',
- 'rafter_direction',
- 'waterproof_material',
- 'insulation_presence',
- 'structure_order',
+ 'INSTALLATION_SYSTEM',
+ 'CONSTRUCTION_YEAR',
+ 'RAFTER_SIZE',
+ 'RAFTER_PITCH',
+ 'RAFTER_DIRECTION',
+ 'WATERPROOF_MATERIAL',
+ 'INSULATION_PRESENCE',
+ 'STRUCTURE_ORDER',
] as const
- const etcFields = ['installation_system', 'construction_year', 'rafter_size', 'rafter_pitch', 'waterproof_material', 'structure_order'] as const
+ const etcFields = ['INSTALLATION_SYSTEM', 'CONSTRUCTION_YEAR', 'RAFTER_SIZE', 'RAFTER_PITCH', 'WATERPROOF_MATERIAL', 'STRUCTURE_ORDER'] as const
const emptyField = requiredFields.find((field) => {
if (etcFields.includes(field as (typeof etcFields)[number])) {
- return surveyDetail[field as keyof SurveyDetailRequest] === null && surveyDetail[`${field}_etc` as keyof SurveyDetailRequest] === null
+ return surveyDetail[field as keyof SurveyDetailRequest] === null && surveyDetail[`${field}_ETC` as keyof SurveyDetailRequest] === null
+ } else {
+ return surveyDetail[field as keyof SurveyDetailRequest] === null
}
- return surveyDetail[field as keyof SurveyDetailRequest] === null
})
- const contractCapacity = surveyDetail.contract_capacity
+ const contractCapacity = surveyDetail.CONTRACT_CAPACITY
if (contractCapacity && contractCapacity.trim() !== '' && contractCapacity.split(' ')?.length === 1) {
- return 'contract_capacity_unit'
+ return 'CONTRACT_CAPACITY_UNIT'
}
return emptyField || ''
diff --git a/src/types/Survey.ts b/src/types/Survey.ts
index 1c68c42..7a3be3c 100644
--- a/src/types/Survey.ts
+++ b/src/types/Survey.ts
@@ -1,117 +1,117 @@
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
- created_at: Date
- updated_at: Date
+ 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
}
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: number | null
- installation_system_etc: string | null
- construction_year: number | null
- construction_year_etc: string | null
- roof_material: string | null // number 배열
- roof_material_etc: string | null
- roof_shape: number | null
- roof_shape_etc: string | null
- roof_slope: string | null
- house_structure: number | null
- house_structure_etc: string | null
- rafter_material: number | null
- rafter_material_etc: string | null
- rafter_size: number | null
- rafter_size_etc: string | null
- rafter_pitch: number | null
- rafter_pitch_etc: string | null
- rafter_direction: number | null
- open_field_plate_kind: number | null
- open_field_plate_kind_etc: string | null
- open_field_plate_thickness: string | null
- leak_trace: boolean | null
- waterproof_material: number | null
- waterproof_material_etc: string | null
- insulation_presence: number | null
- insulation_presence_etc: string | null
- structure_order: number | null
- structure_order_etc: string | null
- installation_availability: number | null
- installation_availability_etc: string | null
- memo: string | null
- created_at: Date
- updated_at: Date
+ 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
}
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
+ 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
}
export type SurveyDetailRequest = {
- contract_capacity: string | null
- retail_company: string | null
- supplementary_facilities: string | null // number 배열
- supplementary_facilities_etc: string | null
- installation_system: number | null
- installation_system_etc: string | null
- construction_year: number | null
- construction_year_etc: string | null
- roof_material: string | null // number 배열
- roof_material_etc: string | null
- roof_shape: number | null
- roof_shape_etc: string | null
- roof_slope: string | null
- house_structure: number | null
- house_structure_etc: string | null
- rafter_material: number | null
- rafter_material_etc: string | null
- rafter_size: number | null
- rafter_size_etc: string | null
- rafter_pitch: number | null
- rafter_pitch_etc: string | null
- rafter_direction: number | null
- open_field_plate_kind: number | null
- open_field_plate_kind_etc: string | null
- open_field_plate_thickness: string | null
- leak_trace: boolean | null
- waterproof_material: number | null
- waterproof_material_etc: string | null
- insulation_presence: number | null
- insulation_presence_etc: string | null
- structure_order: number | null
- structure_order_etc: string | null
- installation_availability: number | null
- installation_availability_etc: string | null
- memo: string | null
+ 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
}
export type SurveyDetailCoverRequest = {
- detail_info: SurveyDetailRequest
+ DETAIL_INFO: SurveyDetailRequest
}
|