qcast3/onsitesurvey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add SUBMISSION_TARGET_ID, SRL_NO Column

Browse Source 
- 제출 대상 판매점 ID, 일련번호 컬럼 추가
- 임시 저장 시 일련번호에 '임시저장000' 으로 저장
- 조사매물 목록 조회 필터링 조건 수정
- url 에러 핸들링
This commit is contained in:
Dayoung 2025-05-21 17:53:58 +09:00
parent e69c45105e
commit 333943c651
11 changed files with 225 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,25 +19,54 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
}
}
const getNewSrlNo = async (srlNo: string, storeId: string) => {
let newSrlNo = srlNo
console.log('srlNo:: ', srlNo)
if (srlNo.startsWith('一時保存')) {
//@ts-ignore
const lastSurvey = await prisma.SD_SURVEY_SALES_BASIC_INFO.findFirst({
where: {
SRL_NO: {
startsWith: storeId,
},
},
orderBy: {
ID: 'desc',
},
})
const lastNo = lastSurvey ? parseInt(lastSurvey.SRL_NO.slice(-3)) : 0
newSrlNo =
storeId +
new Date().getFullYear().toString().slice(-2) +
(new Date().getMonth() + 1).toString().padStart(2, '0') +
new Date().getDate().toString().padStart(2, '0') +
(lastNo + 1).toString().padStart(3, '0')
}
return newSrlNo
}
export async function PUT(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
try {
const { id } = await params
const body = await request.json()
const { detailInfo, ...basicInfo } = body
const { detailInfo, ...basicInfo } = body.survey
// PUT 요청 시 임시저장 여부 확인 후 임시저장 시 기존 SRL_NO 사용, 기본 저장 시 새로운 SRL_NO 생성
const newSrlNo = body.isTemporary ? body.survey.srlNo : await getNewSrlNo(body.survey.srlNo, body.storeId)
// @ts-ignore
const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
where: { ID: Number(id) },
data: {
...convertToSnakeCase(basicInfo),
SRL_NO: newSrlNo,
UPT_DT: new Date(),
DETAIL_INFO: {
update: convertToSnakeCase(detailInfo)
}
update: convertToSnakeCase(detailInfo),
},
},
include: {
DETAIL_INFO: true
}
DETAIL_INFO: true,
},
})
return NextResponse.json(survey)
} catch (error) {
@ -84,49 +113,24 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
const { id } = await params
const body = await request.json()
if (body.submit) {
// 제출 시 기존 SRL_NO 확인 후 '임시저장'으로 시작하면 새로운 SRL_NO 생성
const newSrlNo = await getNewSrlNo(body.srlNo, body.storeId)
if (body.targetId) {
// @ts-ignore
const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
where: { ID: Number(id) },
data: {
SUBMISSION_STATUS: true,
SUBMISSION_DATE: new Date(),
SUBMISSION_TARGET_ID: body.targetId,
UPT_DT: new Date(),
SRL_NO: newSrlNo,
},
})
console.log(survey)
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: convertToSnakeCase(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: convertToSnakeCase(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 })

57
src/app/api/survey-sales/route.ts
View File

@ -1,6 +1,7 @@
import { NextResponse } from 'next/server'
import { prisma } from '@/libs/prisma'
import { convertToSnakeCase } from '@/utils/common-utils'
import { equal } from 'assert'
/**
* 검색 파라미터
*/
@ -110,13 +111,14 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
switch (params.role) {
case 'Admin': // 1차점
// 같은 판매점에서 작성된 매물 + 2차점에서 제출받은 매물
where.OR = [
{
// 같은 판매점에서 작성한 제출/제출되지 않은 매물
AND: [{ STORE: { equals: params.store } }],
},
{
AND: [{ STORE: { startsWith: params.store } }, { SUBMISSION_STATUS: { equals: true } }],
// MUSUBI (시공권한 X) 가 ORDER 에 제출한 매물
AND: [{ SUBMISSION_TARGET_ID: { equals: params.store } }, { SUBMISSION_STATUS: { equals: true } }],
},
]
break
@ -124,6 +126,7 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
case 'Admin_Sub': // 2차점
where.OR = [
{
// MUSUBI (시공권한 X) 같은 판매점에서 작성한 제출/제출되지 않은 매물
AND: [
{ STORE: { equals: params.store } },
{
@ -132,8 +135,9 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
],
},
{
// MUSUBI (시공권한 O) 가 MUSUBI 에 제출한 매물 + PARTNER 가 제출한 매물
AND: [
{ STORE: { equals: params.store } },
{ SUBMISSION_TARGET_ID: { equals: params.store } },
{ CONSTRUCTION_POINT: { not: null } },
{ CONSTRUCTION_POINT: { not: '' } },
{ SUBMISSION_STATUS: { equals: true } },
@ -142,8 +146,8 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
]
break
case 'Builder': // 2차점 시공권한
case 'Partner': // Partner
case 'Builder': // MUSUBI (시공권한 O)
case 'Partner': // PARTNER
// 같은 시공ID에서 작성된 매물
where.AND?.push({
CONSTRUCTION_POINT: { equals: params.builderNo },
@ -151,7 +155,14 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
break
case 'T01':
where.AND.push(filterTempData())
// where.AND.push(filterTempData())
where.AND?.push({
NOT: {
SRL_NO: {
startsWith: '一時保存',
},
},
})
break
case 'User':
// 모든 매물 조회 가능 (추가 조건 없음)
@ -247,21 +258,45 @@ export async function PUT(request: Request) {
export async function POST(request: Request) {
try {
const body = await request.json()
console.log('body:: ', body)
const { detailInfo, ...basicInfo } = body
// 임시 저장 시 임시저장 + 000 으로 저장
// 기본 저장 시 판매점ID + yyMMdd + 000 으로 저장
const baseSrlNo =
body.survey.srlNo ??
body.storeId +
new Date().getFullYear().toString().slice(-2) +
(new Date().getMonth() + 1).toString().padStart(2, '0') +
new Date().getDate().toString().padStart(2, '0')
// 기본 정보 생성
//@ts-ignore
// @ts-ignore
const lastSurvey = await prisma.SD_SURVEY_SALES_BASIC_INFO.findFirst({
where: {
SRL_NO: {
startsWith: body.storeId,
},
},
orderBy: {
SRL_NO: 'desc',
},
})
// 마지막 번호 추출
const lastNumber = lastSurvey ? parseInt(lastSurvey.SRL_NO.slice(-3)) : 0
// 새로운 srlNo 생성
const newSrlNo = baseSrlNo + (lastNumber + 1).toString().padStart(3, '0')
const { detailInfo, ...basicInfo } = body.survey
// @ts-ignore
const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({
data: {
...convertToSnakeCase(basicInfo),
SRL_NO: newSrlNo,
DETAIL_INFO: {
create: convertToSnakeCase(detailInfo),
},
},
})
console.log('result:: ', result)
return NextResponse.json(result)
} catch (error) {
console.error(error)

2
src/components/survey-sale/detail/BasicForm.tsx
View File

@ -25,7 +25,7 @@ export default function BasicForm(props: { basicInfo: SurveyBasicRequest; setBas
setBasicInfo({
...basicInfo,
representative: session.userNm ?? '',
store: session.storeNm ?? null,
store: session.role === 'Partner' ? null : session.storeNm ?? null,
constructionPoint: session.builderNo ?? null,
})
}

80
src/components/survey-sale/detail/ButtonForm.tsx
View File

@ -10,7 +10,6 @@ export default function ButtonForm(props: {
mode: Mode
setMode: (mode: Mode) => void
data: { basic: SurveyBasicRequest; roof: SurveyDetailRequest }
isTemporarySave: boolean
}) {
// 라우터
const router = useRouter()
@ -28,6 +27,9 @@ export default function ButtonForm(props: {
...props.data.basic,
detailInfo: props.data.roof,
})
// !!!!!!!!!!
const [tempTargetId, setTempTargetId] = useState('')
// --------------------------------------------------------------
// 권한
@ -39,7 +41,26 @@ export default function ButtonForm(props: {
useEffect(() => {
if (session?.isLoggedIn) {
setIsSubmiter(session.storeNm === props.data.basic.store && session.builderNo === props.data.basic.constructionPoint)
switch (session?.role) {
// T01 제출권한 없음
case 'T01':
setIsSubmiter(false)
break
// 1차 판매점(Order) + 2차 판매점(Musubi) => 같은 판매점 제출권한
case 'Admin':
case 'Admin_Sub':
setIsSubmiter(session.storeNm === props.data.basic.store && session.builderNo === props.data.basic.constructionPoint)
break
// 시공권한 User(Musubi) + Partner => 같은 시공ID 제출권한
case 'Builder':
case 'Partner':
setIsSubmiter(session.builderNo === props.data.basic.constructionPoint)
break
default:
setIsSubmiter(false)
break
}
setIsWriter(session.userNm === props.data.basic.representative)
}
setSaveData({
@ -50,8 +71,8 @@ export default function ButtonForm(props: {
// ------------------------------------------------------------
// 저장/임시저장/수정
const id = Number(routeId) ? Number(routeId) : Number(idParam)
const id = routeId ? Number(routeId) : Number(idParam)
const { deleteSurvey, submitSurvey, updateSurvey } = useServey(Number(id))
const { validateSurveyDetail, createSurvey } = useServey()
@ -68,11 +89,15 @@ export default function ButtonForm(props: {
const tempSaveProcess = async () => {
if (idParam) {
await updateSurvey(saveData)
router.push(`/survey-sale/detail?id=${idParam}&isTemporary=true`)
await updateSurvey({ survey: saveData, isTemporary: true })
router.push(`/survey-sale/${idParam}`)
} else {
const id = await createSurvey(saveData)
router.push(`/survey-sale/detail?id=${id}&isTemporary=true`)
const updatedData = {
...saveData,
srlNo: '一時保存',
}
const id = await createSurvey(updatedData)
router.push(`/survey-sale/${id}`)
}
alert('一時保存されました。')
}
@ -92,11 +117,12 @@ export default function ButtonForm(props: {
...saveData,
submissionStatus: true,
submissionDate: new Date().toISOString(),
submissionTargetId: tempTargetId,
}
await updateSurvey(updatedData)
await updateSurvey({ survey: updatedData, isTemporary: false, storeId: session.storeId ?? '' })
router.push(`/survey-sale/${idParam}`)
} else {
await updateSurvey(saveData)
await updateSurvey({ survey: saveData, isTemporary: false, storeId: session.storeId ?? '' })
router.push(`/survey-sale/${idParam}`)
}
} else {
@ -105,6 +131,7 @@ export default function ButtonForm(props: {
...saveData,
submissionStatus: true,
submissionDate: new Date().toISOString(),
submissionTargetId: tempTargetId,
}
const id = await createSurvey(updatedData)
submitProcess(id)
@ -137,10 +164,14 @@ export default function ButtonForm(props: {
}
const handleSubmit = async () => {
if (props.isTemporarySave) {
if (props.data.basic.srlNo?.startsWith('一時保存')) {
alert('一時保存されたデータは提出できません。')
return
}
if (tempTargetId.trim() === '') {
alert('提出対象店舗を入力してください。')
return
}
window.neoConfirm('提出しますか？', async () => {
if (Number(routeId)) {
submitProcess()
@ -149,8 +180,9 @@ export default function ButtonForm(props: {
}
})
}
const submitProcess = async (saveId?: number) => {
await submitSurvey(saveId)
await submitSurvey({ saveId: saveId, targetId: tempTargetId, storeId: session.storeId ?? '', srlNo: '一時保存' })
alert('提出されました。')
router.push('/survey-sale')
}
@ -176,7 +208,7 @@ export default function ButtonForm(props: {
<ListButton />
<EditButton setMode={setMode} id={id.toString()} mode={mode} />
{(isWriter || !isSubmiter) && <DeleteButton handleDelete={handleDelete} />}
{!isSubmit && isSubmiter && <SubmitButton handleSubmit={handleSubmit} />}
{!isSubmit && isSubmiter && <SubmitButton handleSubmit={handleSubmit} setTempTargetId={setTempTargetId} />}
</div>
</div>
)}
@ -187,7 +219,7 @@ export default function ButtonForm(props: {
<ListButton />
<TempButton setMode={setMode} handleSave={handleSave} />
<SaveButton handleSave={handleSave} />
<SubmitButton handleSubmit={handleSubmit} />
<SubmitButton handleSubmit={handleSubmit} setTempTargetId={setTempTargetId} />
</div>
</div>
)}
@ -227,15 +259,20 @@ function EditButton(props: { setMode: (mode: Mode) => void; id: string; mode: Mo
)
}
function SubmitButton(props: { handleSubmit: () => void }) {
const { handleSubmit } = props
function SubmitButton(props: { handleSubmit: () => void; setTempTargetId: (targetId: string) => void }) {
const { handleSubmit, setTempTargetId } = props
return (
<div className="btn-bx">
{/* 제출 */}
<button className="btn-frame red icon" onClick={handleSubmit}>
提出<i className="btn-arr"></i>
</button>
</div>
<>
<div className="btn-bx">
{/* 제출 */}
<button className="btn-frame red icon" onClick={handleSubmit}>
提出<i className="btn-arr"></i>
</button>
</div>
<div>
<input type="text" placeholder="temp target id" onChange={(e) => setTempTargetId(e.target.value)} />
</div>
</>
)
}
@ -273,7 +310,6 @@ function TempButton(props: { setMode: (mode: Mode) => void; handleSave: (isTempo
<button
className="btn-frame n-blue icon"
onClick={() => {
setMode('TEMP')
handleSave(true)
}}
>

33
src/components/survey-sale/detail/DataTable.tsx
View File

@ -1,33 +1,22 @@
'use client'
import { useServey } from '@/hooks/useSurvey'
import { useParams, useSearchParams } from 'next/navigation'
import { useEffect, useState } from 'react'
import { useParams } from 'next/navigation'
import { useEffect } from 'react'
import DetailForm from './DetailForm'
export default function DataTable() {
const params = useParams()
const id = params.id
const searchParams = useSearchParams()
const isTemp = searchParams.get('isTemporary')
useEffect(() => {
if (Number.isNaN(Number(id))) {
alert('間違ったアプローチです。')
window.location.href = '/survey-sale'
}
}, [id])
const { surveyDetail, isLoadingSurveyDetail } = useServey(Number(id))
const [isTemporarySave, setIsTemporarySave] = useState(isTemp === 'true')
const { validateSurveyDetail } = useServey(Number(id))
useEffect(() => {
if (surveyDetail?.detailInfo) {
const validate = validateSurveyDetail(surveyDetail.detailInfo)
console.log('validate:: ', validate)
if (validate.trim() !== '') {
setIsTemporarySave(true)
}
}
}, [surveyDetail])
console.log('isTemporarySave:: ', isTemporarySave)
if (isLoadingSurveyDetail) {
return <div>Loading...</div>
@ -44,12 +33,12 @@ export default function DataTable() {
<tbody>
<tr>
<th>登録番号</th>
{isTemporarySave ? (
{surveyDetail?.srlNo?.startsWith('一時保存') ? (
<td>
<span className="text-red-500">仮保存</span>
</td>
) : (
<td>{surveyDetail?.id}</td>
<td>{surveyDetail?.srlNo}</td>
)}
</tr>
<tr>
@ -85,7 +74,7 @@ export default function DataTable() {
</tbody>
</table>
</div>
<DetailForm isTemporarySave={isTemporarySave} />
<DetailForm />
</>
)
}

21
src/components/survey-sale/detail/DetailForm.tsx
View File

@ -5,7 +5,7 @@ import { useEffect, useState } from 'react'
import ButtonForm from './ButtonForm'
import BasicForm from './BasicForm'
import RoofForm from './RoofForm'
import { useParams, useSearchParams } from 'next/navigation'
import { useParams, useRouter, useSearchParams } from 'next/navigation'
import { useServey } from '@/hooks/useSurvey'
const roofInfoForm: SurveyDetailRequest = {
@ -58,22 +58,29 @@ const basicInfoForm: SurveyBasicRequest = {
addressDetail: null,
submissionStatus: false,
submissionDate: null,
submissionTargetId: null,
srlNo: null,
}
export default function DetailForm(props: { isTemporarySave: boolean }) {
const { isTemporarySave } = props
export default function DetailForm() {
const idParam = useSearchParams().get('id')
const routeId = useParams().id
const id = idParam ?? routeId
const modeset = Number(routeId) ? 'READ' : idParam ? 'EDIT' : 'CREATE'
const id = Number(routeId) ? Number(routeId) : Number(idParam)
const { surveyDetail, validateSurveyDetail } = useServey(Number(id))
const [mode, setMode] = useState<Mode>(idParam ? 'EDIT' : routeId ? 'READ' : 'CREATE')
const [mode, setMode] = useState<Mode>(modeset)
const [basicInfoData, setBasicInfoData] = useState<SurveyBasicRequest>(basicInfoForm)
const [roofInfoData, setRoofInfoData] = useState<SurveyDetailRequest>(roofInfoForm)
useEffect(() => {
if (Number(idParam) !== 0 && surveyDetail === null) {
alert('データが見つかりません。')
window.location.href = '/survey-sale'
}
if (surveyDetail && (mode === 'EDIT' || mode === 'READ')) {
const { id, uptDt, regDt, detailInfo, ...rest } = surveyDetail
setBasicInfoData(rest)
@ -84,14 +91,14 @@ export default function DetailForm(props: { isTemporarySave: boolean }) {
}
}
}
}, [surveyDetail])
}, [surveyDetail, id])
const data = {
basic: basicInfoData,
roof: roofInfoData,
}
const buttonFormProps = { mode, setMode, data, isTemporarySave }
const buttonFormProps = { mode, setMode, data }
return (
<>

26
src/components/survey-sale/detail/RoofForm.tsx
View File

@ -230,6 +230,14 @@ export default function RoofForm(props: {
}
}
}
if (key === 'contractCapacity') {
const remainValue = roofInfo.contractCapacity?.split(' ')[1] ?? roofInfo.contractCapacity
if (Number.isNaN(Number(remainValue))) {
setRoofInfo({ ...roofInfo, [key]: value + ' ' + remainValue })
return
}
setRoofInfo({ ...roofInfo, [key]: value.toString() })
}
setRoofInfo({ ...roofInfo, [key]: value.toString() })
}
@ -237,7 +245,7 @@ export default function RoofForm(props: {
const numericValue = roofInfo.contractCapacity?.replace(/[^0-9.]/g, '') || ''
setRoofInfo({
...roofInfo,
contractCapacity: numericValue ? `${numericValue} ${value}` : value,
contractCapacity: numericValue ? `${numericValue} ${value}` : '0 ' + value,
})
}
@ -261,7 +269,7 @@ export default function RoofForm(props: {
{mode !== 'READ' && (
<div className="data-input mb5">
<input
type="text"
type="number"
id="contractCapacity"
className="input-frame"
value={roofInfo?.contractCapacity?.split(' ')[0] ?? ''}
@ -525,15 +533,16 @@ const SelectedBox = ({
選択してください
</option>
</select>
<div className="data-input">
<div className={`data-input ${column === 'constructionYear' ? 'flex' : ''}`}>
<input
type="text"
type={column === 'constructionYear' ? 'number' : 'text'}
className="input-frame"
placeholder="-"
value={detailInfoData[`${column}Etc` as keyof SurveyDetailInfo]?.toString() ?? ''}
onChange={handleEtcInputChange}
disabled={isInputDisabled()}
/>
{column === 'constructionYear' && <span>年</span>}
</div>
</>
)
@ -553,9 +562,8 @@ const RadioSelected = ({
const etcValue = detailInfoData?.[`${column}Etc` as keyof SurveyDetailInfo]
const [etcChecked, setEtcChecked] = useState<boolean>(Boolean(etcValue))
const selectedId = column === 'leakTrace'
? Number(detailInfoData?.[column as keyof SurveyDetailInfo]) || 2
: detailInfoData?.[column as keyof SurveyDetailInfo]
const selectedId =
column === 'leakTrace' ? Number(detailInfoData?.[column as keyof SurveyDetailInfo]) || 2 : detailInfoData?.[column as keyof SurveyDetailInfo]
const isSpecialColumn = column === 'rafterDirection' || column === 'leakTrace' || column === 'insulationPresence'
const showEtcOption = !isSpecialColumn
@ -582,7 +590,7 @@ const RadioSelected = ({
setRoofInfo({
...detailInfoData,
[column]: value,
[`${column}Etc`]: isRafterDirection ? detailInfoData[`${column}Etc` as keyof SurveyDetailInfo] : null
[`${column}Etc`]: isRafterDirection ? detailInfoData[`${column}Etc` as keyof SurveyDetailInfo] : null,
})
}
@ -696,7 +704,7 @@ const MultiCheck = ({
// 기타 선택 해제 시 값도 null로 설정
setRoofInfo({
...roofInfo,
[`${column}Etc`]: newIsOtherCheck ? '' : null
[`${column}Etc`]: newIsOtherCheck ? '' : null,
})
}

24
src/components/survey-sale/list/ListTable.tsx
View File

@ -30,7 +30,7 @@ export default function ListTable() {
if (!session.isLoggedIn || !('data' in surveyList)) return
if ('count' in surveyList && surveyList.count > 0) {
if (offset > 0) {
setHeldSurveyList(prev => [...prev, ...surveyList.data])
setHeldSurveyList((prev) => [...prev, ...surveyList.data])
} else {
setHeldSurveyList(surveyList.data)
}
@ -50,14 +50,14 @@ export default function ListTable() {
return (
<>
<SearchForm memberRole={session?.role ?? ''} userNm={session?.userNm ?? ''} />
{heldSurveyList.length > 0 ? (
<div className="sale-frame">
<ul className="sale-list-wrap">
{heldSurveyList.length > 0 ? (
<ul className="sale-list-wrap">
{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">{survey.id}</div>
<div className="sale-item-num">{survey.srlNo}</div>
<div className="sale-item-date">{survey.investigationDate}</div>
</div>
<div className="sale-item-tit">{survey.buildingName}</div>
@ -67,18 +67,18 @@ export default function ListTable() {
<div className="sale-item-update">{new Date(survey.uptDt).toLocaleString()}</div>
</div>
</div>
</li>
))}
</ul>
</li>
))}
</ul>
) : (
<div className="compliace-nosearch">
<span className="mb10">作成された物件はありません。</span>
</div>
)}
<div className="sale-edit-btn">
<LoadMoreButton hasMore={hasMore} onLoadMore={() => setOffset(offset + 10)} />
</div>
</div>
) : (
<div>
<p>作成された物件はありません。</p>
</div>
)}
</>
)
}

2
src/components/ui/Main.tsx
View File

@ -34,7 +34,7 @@ export default function Main() {
<div className="main-bx-icon">
<img src="/assets/images/main/main_icon02.svg" alt="" />
</div>
<button className="main-bx-arr" onClick={() => router.push('/survey-sale/basic-info')}></button>
<button className="main-bx-arr" onClick={() => router.push('/survey-sale/regist')}></button>
</div>
<div className="grid-bx-body">
<div className="grid-bx-body-tit">調査物件登録</div>

20
src/hooks/useSurvey.ts
View File

@ -65,9 +65,9 @@ export function useServey(id?: number): {
isDeletingSurvey: boolean
createSurvey: (survey: SurveyRegistRequest) => Promise<number>
createSurveyDetail: (params: { surveyId: number; surveyDetail: SurveyDetailCoverRequest }) => void
updateSurvey: (survey: SurveyRegistRequest) => void
updateSurvey: ({ survey, isTemporary, storeId }: { survey: SurveyRegistRequest; isTemporary: boolean; storeId?: string }) => void
deleteSurvey: () => Promise<boolean>
submitSurvey: (saveId?: number) => void
submitSurvey: (params: { saveId?: number; targetId?: string; storeId?: string; srlNo?: string }) => void
validateSurveyDetail: (surveyDetail: SurveyDetailRequest) => string
getZipCode: (zipCode: string) => Promise<ZipCode[] | null>
refetchSurveyList: () => void
@ -119,7 +119,7 @@ export function useServey(id?: number): {
const { mutateAsync: createSurvey, isPending: isCreatingSurvey } = useMutation({
mutationFn: async (survey: SurveyRegistRequest) => {
const resp = await axiosInstance(null).post<SurveyBasicInfo>('/api/survey-sales', survey)
const resp = await axiosInstance(null).post<SurveyBasicInfo>('/api/survey-sales', { survey: survey, storeId: session?.storeId ?? null })
return resp.data.id ?? 0
},
onSuccess: (data) => {
@ -130,10 +130,14 @@ export function useServey(id?: number): {
})
const { mutate: updateSurvey, isPending: isUpdatingSurvey } = useMutation({
mutationFn: async (survey: SurveyRegistRequest) => {
mutationFn: async ({ survey, isTemporary, storeId }: { survey: SurveyRegistRequest; isTemporary: boolean; storeId?: string }) => {
console.log('updateSurvey, survey:: ', survey)
if (id === undefined) throw new Error('id is required')
const resp = await axiosInstance(null).put<SurveyRegistRequest>(`/api/survey-sales/${id}`, survey)
const resp = await axiosInstance(null).put<SurveyRegistRequest>(`/api/survey-sales/${id}`, {
survey: survey,
isTemporary: isTemporary,
storeId: storeId,
})
return resp.data
},
onSuccess: () => {
@ -166,11 +170,13 @@ export function useServey(id?: number): {
})
const { mutateAsync: submitSurvey } = useMutation({
mutationFn: async (saveId?: number) => {
mutationFn: async ({ saveId, targetId, storeId, srlNo }: { saveId?: number; targetId?: string; storeId?: string; srlNo?: string }) => {
const submitId = saveId ?? id
if (!submitId) throw new Error('id is required')
const resp = await axiosInstance(null).patch<boolean>(`/api/survey-sales/${submitId}`, {
submit: true,
targetId,
storeId,
srlNo,
})
return resp.data
},

6
src/types/Survey.ts
View File

@ -14,6 +14,8 @@ export type SurveyBasicInfo = {
detailInfo: SurveyDetailInfo | null
regDt: Date
uptDt: Date
submissionTargetId: string | null
srlNo: string | null //판매점IDyyMMdd000
}
export type SurveyDetailInfo = {
@ -70,6 +72,8 @@ export type SurveyBasicRequest = {
addressDetail: string | null
submissionStatus: boolean
submissionDate: string | null
submissionTargetId: string | null
srlNo: string | null //판매점IDyyMMdd000
}
export type SurveyDetailRequest = {
@ -127,6 +131,8 @@ export type SurveyRegistRequest = {
submissionStatus: boolean
submissionDate: string | null
detailInfo: SurveyDetailRequest | null
submissionTargetId: string | null
srlNo: string | null //판매점IDyyMMdd000
}
export type Mode = 'CREATE' | 'EDIT' | 'READ' | 'TEMP' // 등록 | 수정 | 상세 | 임시저장