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

Merge pull request 'fix: 2차점 시공권한 계정 조사매물 조회 및 생성 로직 변경' (#121) from feature/survey into dev

Browse Source 
Reviewed-on: #121
This commit is contained in:
seul 2025-08-05 16:14:48 +09:00
commit 7e2d93426f
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/api/survey-sales/service.ts
View File

@ -128,8 +128,8 @@ export class SurveySalesService {
break break
case 'Builder': case 'Builder':
case 'Partner': case 'Partner':
if (this.session?.builderId) { if (this.session?.builderNo) {
where.AND.push({ CONSTRUCTION_POINT_ID: { equals: this.session?.builderId } }) where.AND.push({ CONSTRUCTION_POINT_ID: { equals: this.session?.builderNo } })
} else { } else {
where.AND.push({ REPRESENTATIVE_ID: { equals: this.session?.userId } }) where.AND.push({ REPRESENTATIVE_ID: { equals: this.session?.userId } })
} }
@ -374,8 +374,8 @@ export class SurveySalesService {
T01: () => this.checkT01Role(survey, session.userId, session.storeId), T01: () => this.checkT01Role(survey, session.userId, session.storeId),
Admin: () => this.checkAdminRole(survey, session.storeId, session.storeNm), Admin: () => this.checkAdminRole(survey, session.storeId, session.storeNm),
Admin_Sub: () => this.checkAdminRole(survey, session.storeId, session.storeNm), Admin_Sub: () => this.checkAdminRole(survey, session.storeId, session.storeNm),
Partner: () => this.checkPartnerOrBuilderRole(survey, session.builderId, session.userId), Partner: () => this.checkPartnerOrBuilderRole(survey, session.builderNo, session.userId),
Builder: () => this.checkPartnerOrBuilderRole(survey, session.builderId, session.userId), Builder: () => this.checkPartnerOrBuilderRole(survey, session.builderNo, session.userId),
default: () => false, default: () => false,
} }

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

@ -85,11 +85,11 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) {
case 'Admin': case 'Admin':
return session.storeId === basicData.storeId return session.storeId === basicData.storeId
case 'Admin_Sub': case 'Admin_Sub':
return session.storeId === basicData.storeId && session.builderId === basicData.constructionPointId return session.storeId === basicData.storeId && session.builderNo === basicData.constructionPointId
case 'Builder': case 'Builder':
return session.builderId ? session.builderId === basicData.constructionPointId : session.userId === basicData.representativeId return session.builderNo ? session.builderNo === basicData.constructionPointId : session.userId === basicData.representativeId
case 'Partner': case 'Partner':
return session.builderId === basicData.constructionPointId return session.builderNo === basicData.constructionPointId
default: default:
return false return false
} }
@ -151,7 +151,7 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) {
await updateSurvey({ await updateSurvey({
survey: saveData, survey: saveData,
isTemporary: false, isTemporary: false,
storeId: session?.role === 'Partner' ? session?.builderId ?? null : session?.storeId ?? null, storeId: session?.role === 'Partner' ? session?.builderNo ?? null : session?.storeId ?? null,
}) })
if (!isUpdatingSurvey) { if (!isUpdatingSurvey) {
setMode('READ') setMode('READ')

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

@ -87,7 +87,7 @@ export default function DetailForm() {
store: session?.storeNm ?? null, store: session?.storeNm ?? null,
storeId: session?.storeId ?? null, storeId: session?.storeId ?? null,
constructionPoint: session?.builderNm ?? null, constructionPoint: session?.builderNm ?? null,
constructionPointId: session.role === 'Builder' ? (session.builderId ? session.builderId : '') : session.builderId ?? null, constructionPointId: session.role === 'Builder' ? (session.builderNo ? session.builderNo : '') : session.builderNo ?? null,
})) }))
const [roofInfoData, setRoofInfoData] = useState<SurveyDetailRequest>(roofInfoForm) const [roofInfoData, setRoofInfoData] = useState<SurveyDetailRequest>(roofInfoForm)
@ -109,7 +109,7 @@ export default function DetailForm() {
store: session.storeNm ?? null, store: session.storeNm ?? null,
storeId: session.storeId ?? null, storeId: session.storeId ?? null,
constructionPoint: session.builderNm ?? null, constructionPoint: session.builderNm ?? null,
constructionPointId: session.role === 'Builder' ? (session.builderId ? session.builderId : '') : session.builderId ?? null, constructionPointId: session.role === 'Builder' ? (session.builderNo ? session.builderNo : '') : session.builderNo ?? null,
})) }))
}, [session?.isLoggedIn]) }, [session?.isLoggedIn])

2
src/hooks/useSurvey.ts
View File

@ -280,7 +280,7 @@ export function useSurvey(
mutationFn: async (survey: SurveyRegistRequest) => { mutationFn: async (survey: SurveyRegistRequest) => {
const resp = await axiosInstance(null).post<{ id: number }>('/api/survey-sales', { const resp = await axiosInstance(null).post<{ id: number }>('/api/survey-sales', {
survey: survey, survey: survey,
storeId: session?.role === 'Partner' ? session?.builderId ?? null : session?.storeId ?? null, storeId: session?.role === 'Partner' ? session?.builderNo ?? null : session?.storeId ?? null,
role: session?.role ?? null, role: session?.role ?? null,
}) })
return resp.data.id ?? 0 return resp.data.id ?? 0