Compare commits

...

28 Commits

Author SHA1 Message Date
47be6a4433 feat: add conditions for read survey list on member type 2025-05-14 09:59:12 +09:00
15e02f60ec Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/survey 2025-05-13 16:46:08 +09:00
1dcb3add79 fix: change Survey's form by Prisma data type changes 2025-05-13 16:45:47 +09:00
f33786a8eb feat: implement user role management in session and update Header component to display user ID 2025-05-13 14:41:09 +09:00
cacf351a7c Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/survey 2025-05-13 14:17:24 +09:00
e5affe0df5 chore: update environment variables and dependencies; add database configuration for QPARTNER login 2025-05-13 13:28:46 +09:00
f8b11c3e7e Merge pull request 'feature/suitable' (#28) from feature/suitable into dev
Reviewed-on: #28
2025-05-13 11:03:33 +09:00
9f4c3de2cf refactor: 지붕재 적합성 테이블 컬럼명 공통코드화 2025-05-13 11:00:20 +09:00
2c75a6b416 refactor: 지붕재 적합성 테이블 컬럼명 수정 2025-05-13 10:51:17 +09:00
7973d7c2b1 Merge pull request 'feature/suitable' (#26) from feature/suitable into dev
Reviewed-on: #26
2025-05-13 09:42:19 +09:00
186843e154 remove: 미사용 테스트 파일 삭제 2025-05-13 09:40:08 +09:00
bc1c1579cc feat: 지붕재 적합성 데이터 관련 테이블 모델 추가 2025-05-13 09:35:21 +09:00
0cdd7cdebd Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/suitable 2025-05-13 09:33:10 +09:00
778d3b6be8 refactor: enhance DoubleBtnAlert and Header components with improved button handling and confirm dialog integration 2025-05-12 18:24:18 +09:00
b4e009cb8e chore: add inquiry API URL to development and production environment files 2025-05-12 18:24:11 +09:00
2d914d3798 Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/suitable 2025-05-12 15:03:49 +09:00
69d81d892d fix: conditionally update session state in EdgeProvider based on presence of sessionData 2025-05-12 13:34:14 +09:00
e84ef1b7a0 fix: update session data handling in RootLayout to conditionally stringify session based on login status 2025-05-12 11:24:32 +09:00
db2daf8ba0 Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/suitable 2025-05-12 09:57:05 +09:00
b61f5205e4 Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/suitable 2025-05-09 09:49:18 +09:00
b1f81d7853 Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/suitable
# Conflicts:
#	src/api/suitable.ts
2025-05-08 15:53:53 +09:00
e86c5d18b4 Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/suitable
# Conflicts:
#	src/app/api/suitable/list/route.ts
#	src/components/Suitable.tsx
#	src/components/SuitableDetails.tsx
#	src/components/SuitableSearch.tsx
2025-05-07 09:52:10 +09:00
adfe6d7a32 feat: 지붕재 적합성 pdf 기본기능 추가 2025-04-30 16:20:36 +09:00
56c2693bb7 Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/suitable 2025-04-30 15:07:15 +09:00
68ea411064 Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/suitable 2025-04-29 10:55:31 +09:00
bfbbdc01b8 feat: 지붕재 데이터 선택 기능 추가 2025-04-29 10:49:58 +09:00
d36084add5 Merge branch 'main' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/suitable 2025-04-29 10:41:18 +09:00
cc8ef6a7d3 feat: 지붕재 데이터 조회 기능 추가 2025-04-28 16:51:01 +09:00
32 changed files with 1019 additions and 687 deletions

View File

@ -4,4 +4,14 @@
NEXT_PUBLIC_API_URL=http://localhost:3000
#qsp 로그인 api
NEXT_PUBLIC_QSP_API_URL=http://1.248.227.176:8120
NEXT_PUBLIC_QSP_API_URL=http://1.248.227.176:8120
#1:1문의 api
NEXT_PUBLIC_INQUIRY_API_URL=http://1.248.227.176:38080
#QPARTNER 로그인 api
DB_HOST=asdf
DB_USER=asdf
DB_PASSWORD=asdf
DB_DATABASE=asdf
DB_PORT=3306

View File

@ -2,4 +2,14 @@
NEXT_PUBLIC_API_URL=http://172.30.1.35:3000
#qsp 로그인 api
NEXT_PUBLIC_QSP_API_URL=http://1.248.227.176:8120
NEXT_PUBLIC_QSP_API_URL=http://1.248.227.176:8120
#1:1문의 api
NEXT_PUBLIC_INQUIRY_API_URL=http://1.248.227.176:38080
#QPARTNER 로그인 api
DB_HOST=asdf
DB_USER=asdf
DB_PASSWORD=asdf
DB_DATABASE=asdf
DB_PORT=3306

View File

@ -41,3 +41,20 @@ onClick={() => popupController.setZipCodePopup(false)}
# useEffect 정리
- client url pathname 변경시 -> @/components/ui/Header.tsx
# User Role 구분
session에 있는 role 키로 구분한다
- T01 / T01 -> Super user\
session.role === 'T01'
- A03 / 1234 -> T01을 제외한 1차점\
session.role === 'Admin'
- 2A03 / 1234 -> 2차점\
session.role === 'Admin_Sub'
- constA03_01 / 1234 -> 시공사\
session.role === 'Builder'
- partners -> Q.Partners 계정\
session.role === 'Partner'
- 이외의 경우 -> 굳이 체크할 필요 없어보임\
session.role === 'User'

View File

@ -9,7 +9,7 @@
"lint": "next lint"
},
"dependencies": {
"@prisma/client": "^6.5.0",
"@prisma/client": "^6.7.0",
"@tanstack/react-query": "^5.71.0",
"@tanstack/react-query-devtools": "^5.71.0",
"axios": "^1.8.4",
@ -29,7 +29,7 @@
"@types/node": "^20",
"@types/react": "^19",
"@types/react-dom": "^19",
"prisma": "^6.5.0",
"prisma": "^6.7.0",
"tailwindcss": "^4",
"typescript": "^5"
}

78
pnpm-lock.yaml generated
View File

@ -9,8 +9,8 @@ importers:
.:
dependencies:
'@prisma/client':
specifier: ^6.5.0
version: 6.5.0(prisma@6.5.0(typescript@5.8.2))(typescript@5.8.2)
specifier: ^6.7.0
version: 6.7.0(prisma@6.7.0(typescript@5.8.2))(typescript@5.8.2)
'@tanstack/react-query':
specifier: ^5.71.0
version: 5.71.0(react@19.1.0)
@ -64,8 +64,8 @@ importers:
specifier: ^19
version: 19.0.4(@types/react@19.0.12)
prisma:
specifier: ^6.5.0
version: 6.5.0(typescript@5.8.2)
specifier: ^6.7.0
version: 6.7.0(typescript@5.8.2)
tailwindcss:
specifier: ^4
version: 4.0.17
@ -541,8 +541,8 @@ packages:
resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==}
engines: {node: '>= 10.0.0'}
'@prisma/client@6.5.0':
resolution: {integrity: sha512-M6w1Ql/BeiGoZmhMdAZUXHu5sz5HubyVcKukbLs3l0ELcQb8hTUJxtGEChhv4SVJ0QJlwtLnwOLgIRQhpsm9dw==}
'@prisma/client@6.7.0':
resolution: {integrity: sha512-+k61zZn1XHjbZul8q6TdQLpuI/cvyfil87zqK2zpreNIXyXtpUv3+H/oM69hcsFcZXaokHJIzPAt5Z8C8eK2QA==}
engines: {node: '>=18.18'}
peerDependencies:
prisma: '*'
@ -553,23 +553,23 @@ packages:
typescript:
optional: true
'@prisma/config@6.5.0':
resolution: {integrity: sha512-sOH/2Go9Zer67DNFLZk6pYOHj+rumSb0VILgltkoxOjYnlLqUpHPAN826vnx8HigqnOCxj9LRhT6U7uLiIIWgw==}
'@prisma/config@6.7.0':
resolution: {integrity: sha512-di8QDdvSz7DLUi3OOcCHSwxRNeW7jtGRUD2+Z3SdNE3A+pPiNT8WgUJoUyOwJmUr5t+JA2W15P78C/N+8RXrOA==}
'@prisma/debug@6.5.0':
resolution: {integrity: sha512-fc/nusYBlJMzDmDepdUtH9aBsJrda2JNErP9AzuHbgUEQY0/9zQYZdNlXmKoIWENtio+qarPNe/+DQtrX5kMcQ==}
'@prisma/debug@6.7.0':
resolution: {integrity: sha512-RabHn9emKoYFsv99RLxvfG2GHzWk2ZI1BuVzqYtmMSIcuGboHY5uFt3Q3boOREM9de6z5s3bQoyKeWnq8Fz22w==}
'@prisma/engines-version@6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60':
resolution: {integrity: sha512-iK3EmiVGFDCmXjSpdsKGNqy9hOdLnvYBrJB61far/oP03hlIxrb04OWmDjNTwtmZ3UZdA5MCvI+f+3k2jPTflQ==}
'@prisma/engines-version@6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed':
resolution: {integrity: sha512-EvpOFEWf1KkJpDsBCrih0kg3HdHuaCnXmMn7XFPObpFTzagK1N0Q0FMnYPsEhvARfANP5Ok11QyoTIRA2hgJTA==}
'@prisma/engines@6.5.0':
resolution: {integrity: sha512-FVPQYHgOllJklN9DUyujXvh3hFJCY0NX86sDmBErLvoZjy2OXGiZ5FNf3J/C4/RZZmCypZBYpBKEhx7b7rEsdw==}
'@prisma/engines@6.7.0':
resolution: {integrity: sha512-3wDMesnOxPrOsq++e5oKV9LmIiEazFTRFZrlULDQ8fxdub5w4NgRBoxtWbvXmj2nJVCnzuz6eFix3OhIqsZ1jw==}
'@prisma/fetch-engine@6.5.0':
resolution: {integrity: sha512-3LhYA+FXP6pqY8FLHCjewyE8pGXXJ7BxZw2rhPq+CZAhvflVzq4K8Qly3OrmOkn6wGlz79nyLQdknyCG2HBTuA==}
'@prisma/fetch-engine@6.7.0':
resolution: {integrity: sha512-zLlAGnrkmioPKJR4Yf7NfW3hftcvqeNNEHleMZK9yX7RZSkhmxacAYyfGsCcqRt47jiZ7RKdgE0Wh2fWnm7WsQ==}
'@prisma/get-platform@6.5.0':
resolution: {integrity: sha512-xYcvyJwNMg2eDptBYFqFLUCfgi+wZLcj6HDMsj0Qw0irvauG4IKmkbywnqwok0B+k+W+p+jThM2DKTSmoPCkzw==}
'@prisma/get-platform@6.7.0':
resolution: {integrity: sha512-i9IH5lO4fQwnMLvQLYNdgVh9TK3PuWBfQd7QLk/YurnAIg+VeADcZDbmhAi4XBBDD+hDif9hrKyASu0hbjwabw==}
'@swc/counter@0.1.3':
resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
@ -1187,8 +1187,8 @@ packages:
resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
engines: {node: ^10 || ^12 || >=14}
prisma@6.5.0:
resolution: {integrity: sha512-yUGXmWqv5F4PByMSNbYFxke/WbnyTLjnJ5bKr8fLkcnY7U5rU9rUTh/+Fja+gOrRxEgtCbCtca94IeITj4j/pg==}
prisma@6.7.0:
resolution: {integrity: sha512-vArg+4UqnQ13CVhc2WUosemwh6hr6cr6FY2uzDvCIFwH8pu8BXVv38PktoMLVjtX7sbYThxbnZF5YiR8sN2clw==}
engines: {node: '>=18.18'}
hasBin: true
peerDependencies:
@ -1760,38 +1760,38 @@ snapshots:
'@parcel/watcher-win32-x64': 2.5.1
optional: true
'@prisma/client@6.5.0(prisma@6.5.0(typescript@5.8.2))(typescript@5.8.2)':
'@prisma/client@6.7.0(prisma@6.7.0(typescript@5.8.2))(typescript@5.8.2)':
optionalDependencies:
prisma: 6.5.0(typescript@5.8.2)
prisma: 6.7.0(typescript@5.8.2)
typescript: 5.8.2
'@prisma/config@6.5.0':
'@prisma/config@6.7.0':
dependencies:
esbuild: 0.25.2
esbuild-register: 3.6.0(esbuild@0.25.2)
transitivePeerDependencies:
- supports-color
'@prisma/debug@6.5.0': {}
'@prisma/debug@6.7.0': {}
'@prisma/engines-version@6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60': {}
'@prisma/engines-version@6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed': {}
'@prisma/engines@6.5.0':
'@prisma/engines@6.7.0':
dependencies:
'@prisma/debug': 6.5.0
'@prisma/engines-version': 6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60
'@prisma/fetch-engine': 6.5.0
'@prisma/get-platform': 6.5.0
'@prisma/debug': 6.7.0
'@prisma/engines-version': 6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed
'@prisma/fetch-engine': 6.7.0
'@prisma/get-platform': 6.7.0
'@prisma/fetch-engine@6.5.0':
'@prisma/fetch-engine@6.7.0':
dependencies:
'@prisma/debug': 6.5.0
'@prisma/engines-version': 6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60
'@prisma/get-platform': 6.5.0
'@prisma/debug': 6.7.0
'@prisma/engines-version': 6.7.0-36.3cff47a7f5d65c3ea74883f1d736e41d68ce91ed
'@prisma/get-platform': 6.7.0
'@prisma/get-platform@6.5.0':
'@prisma/get-platform@6.7.0':
dependencies:
'@prisma/debug': 6.5.0
'@prisma/debug': 6.7.0
'@swc/counter@0.1.3': {}
@ -2421,10 +2421,10 @@ snapshots:
picocolors: 1.1.1
source-map-js: 1.2.1
prisma@6.5.0(typescript@5.8.2):
prisma@6.7.0(typescript@5.8.2):
dependencies:
'@prisma/config': 6.5.0
'@prisma/engines': 6.5.0
'@prisma/config': 6.7.0
'@prisma/engines': 6.7.0
optionalDependencies:
fsevents: 2.3.3
typescript: 5.8.2

View File

@ -57,65 +57,65 @@ model MS_SUITABLE {
updated_at DateTime @updatedAt
}
model SD_SERVEY_SALES_BASIC_INFO {
id Int @id @default(autoincrement())
representative String @db.VarChar(200)
store String? @db.VarChar(200)
construction_point String? @db.VarChar(200)
investigation_date String? @db.VarChar(10)
building_name String? @db.VarChar(200)
customer_name String? @db.VarChar(200)
post_code String? @db.VarChar(10)
address String? @db.VarChar(200)
address_detail String? @db.VarChar(300)
submission_status Boolean @default(false)
submission_date DateTime? @db.Date
created_at DateTime @default(now())
updated_at DateTime @updatedAt
detail_info SD_SERVEY_SALES_DETAIL_INFO?
model SD_SURVEY_SALES_BASIC_INFO {
ID Int @id @default(autoincrement())
REPRESENTATIVE String @db.VarChar(200)
STORE String? @db.VarChar(200)
CONSTRUCTION_POINT String? @db.VarChar(200)
INVESTIGATION_DATE String? @db.VarChar(10)
BUILDING_NAME String? @db.VarChar(200)
CUSTOMER_NAME String? @db.VarChar(200)
POST_CODE String? @db.VarChar(10)
ADDRESS String? @db.VarChar(200)
ADDRESS_DETAIL String? @db.VarChar(300)
SUBMISSION_STATUS Boolean @default(false)
SUBMISSION_DATE DateTime? @db.Date
REG_DT DateTime @default(now())
UPT_DT DateTime @updatedAt
DETAIL_INFO SD_SURVEY_SALES_DETAIL_INFO?
}
model SD_SERVEY_SALES_DETAIL_INFO {
id Int @id @default(autoincrement())
contract_capacity String? @db.VarChar(20)
retail_company String? @db.VarChar(100)
supplementary_facilities String? @db.VarChar(20)
supplementary_facilities_etc String? @db.VarChar(200)
installation_system Int?
installation_system_etc String? @db.VarChar(200)
construction_year Int?
construction_year_etc String? @db.VarChar(200)
roof_material String? @db.VarChar(20)
roof_material_etc String? @db.VarChar(200)
roof_shape Int?
roof_shape_etc String? @db.VarChar(200)
roof_slope String? @db.VarChar(5)
house_structure Int?
house_structure_etc String? @db.VarChar(200)
rafter_material Int?
rafter_material_etc String? @db.VarChar(200)
rafter_size Int?
rafter_size_etc String? @db.VarChar(200)
rafter_pitch Int?
rafter_pitch_etc String? @db.VarChar(200)
rafter_direction Int?
open_field_plate_kind Int?
open_field_plate_kind_etc String? @db.VarChar(200)
open_field_plate_thickness String? @db.VarChar(5)
leak_trace Boolean? @default(false)
waterproof_material Int?
waterproof_material_etc String? @db.VarChar(200)
insulation_presence Int?
insulation_presence_etc String? @db.VarChar(200)
structure_order Int?
structure_order_etc String? @db.VarChar(200)
installation_availability Int?
installation_availability_etc String? @db.VarChar(200)
memo String? @db.VarChar(500)
created_at DateTime @default(now())
updated_at DateTime @updatedAt
basic_info_id Int @unique
basic_info SD_SERVEY_SALES_BASIC_INFO @relation(fields: [basic_info_id], references: [id])
model SD_SURVEY_SALES_DETAIL_INFO {
ID Int @id @default(autoincrement())
CONTRACT_CAPACITY String? @db.VarChar(20)
RETAIL_COMPANY String? @db.VarChar(100)
SUPPLEMENTARY_FACILITIES String? @db.VarChar(20)
SUPPLEMENTARY_FACILITIES_ETC String? @db.VarChar(200)
INSTALLATION_SYSTEM String? @db.VarChar(20)
INSTALLATION_SYSTEM_ETC String? @db.VarChar(200)
CONSTRUCTION_YEAR String? @db.VarChar(200)
CONSTRUCTION_YEAR_ETC String? @db.VarChar(200)
ROOF_MATERIAL String? @db.VarChar(20)
ROOF_MATERIAL_ETC String? @db.VarChar(200)
ROOF_SHAPE String? @db.VarChar(20)
ROOF_SHAPE_ETC String? @db.VarChar(200)
ROOF_SLOPE String? @db.VarChar(5)
HOUSE_STRUCTURE String? @db.VarChar(20)
HOUSE_STRUCTURE_ETC String? @db.VarChar(200)
RAFTER_MATERIAL String? @db.VarChar(20)
RAFTER_MATERIAL_ETC String? @db.VarChar(200)
RAFTER_SIZE String? @db.VarChar(20)
RAFTER_SIZE_ETC String? @db.VarChar(200)
RAFTER_PITCH String? @db.VarChar(20)
RAFTER_PITCH_ETC String? @db.VarChar(200)
RAFTER_DIRECTION String? @db.VarChar(20)
OPEN_FIELD_PLATE_KIND String? @db.VarChar(20)
OPEN_FIELD_PLATE_KIND_ETC String? @db.VarChar(200)
OPEN_FIELD_PLATE_THICKNESS String? @db.VarChar(5)
LEAK_TRACE Boolean? @default(false)
WATERPROOF_MATERIAL String? @db.VarChar(20)
WATERPROOF_MATERIAL_ETC String? @db.VarChar(200)
INSULATION_PRESENCE String? @db.VarChar(20)
INSULATION_PRESENCE_ETC String? @db.VarChar(200)
STRUCTURE_ORDER String? @db.VarChar(20)
STRUCTURE_ORDER_ETC String? @db.VarChar(200)
INSTALLATION_AVAILABILITY String? @db.VarChar(20)
INSTALLATION_AVAILABILITY_ETC String? @db.VarChar(200)
MEMO String? @db.VarChar(500)
REG_DT DateTime @default(now())
UPT_DT DateTime @updatedAt
BASIC_INFO_ID Int @unique
BASIC_INFO SD_SURVEY_SALES_BASIC_INFO @relation(fields: [BASIC_INFO_ID], references: [ID])
}
model BC_COMM_H {
@ -177,3 +177,33 @@ model BC_COMM_L {
@@id([HEAD_CD, CODE], map: "PK_BC_COMM_L")
}
model MS_SUITABLE_ROOF_MATERIAL_GROUP {
ID Int @id @default(autoincrement())
ROOF_MATERIAL_GROUP String @db.VarChar(200)
ROOF_MT_CD String @db.VarChar(200)
REG_DT DateTime @default(now(), map: "DF__MS_SUITAB__creat__4F7CD00D")
UPT_DT DateTime
}
model MS_SUITABLE_DETAIL {
ID Int @id @default(autoincrement())
MAIN_ID Int
TRESTLE_MFPC_CD String? @db.VarChar(200)
TRESTLE_MANUFACTURER_PRODUCT_NAME String? @db.VarChar(200)
MEMO String? @db.VarChar(500)
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")
}
model MS_SUITABLE_MAIN {
ID Int @id @default(autoincrement())
PRODUCT_NAME String @db.VarChar(200)
MANU_FT_CD String? @db.VarChar(200)
ROOF_MT_CD String? @db.VarChar(100)
ROOF_SH_CD String? @db.VarChar(200)
REG_DT DateTime @default(now(), map: "DF__MS_SUITAB__creat__5441852A")
UPT_DT DateTime?
MS_SUITABLE_DETAIL MS_SUITABLE_DETAIL[]
}

View File

@ -49,6 +49,21 @@ export async function POST(request: Request) {
session.custCd = result.data.data.custCd
session.builderNo = result.data.data.builderNo
session.isLoggedIn = true
if (result.data.data.userId === 'T01') {
session.role = 'T01'
} else if (result.data.data.groupId === '60000') {
session.role = 'Admin'
} else if (result.data.data.groupId === '70000' && result.data.data.builderNo === null) {
session.role = 'Admin_Sub'
} else if (result.data.data.groupId === '70000' && result.data.data.builderNo !== null) {
session.role = 'Builder'
} else if (result.data.data.groupId === '90000' && result.data.data.builderNo !== null) {
session.role = 'Partner'
} else {
session.role = 'User'
}
console.log('end session edit!')
await session.save()

View File

@ -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' })
}
}

View File

@ -1,105 +1,211 @@
import { NextResponse } from 'next/server'
import { prisma } from '@/libs/prisma'
// Types
type SearchParams = {
keyword?: string | null
searchOption?: string | null
isMySurvey?: string | null
sort?: string | null
offset?: string | null
memberRole?: string | null
store?: string | null
builderNo?: string | null
}
type WhereCondition = {
AND?: any[]
OR?: any[]
[key: string]: any
}
// Constants
const SEARCH_OPTIONS = [
'BUILDING_NAME',
'REPRESENTATIVE',
'STORE',
'CONSTRUCTION_POINT',
'CUSTOMER_NAME',
'POST_CODE',
'ADDRESS',
'ADDRESS_DETAIL',
] as const
const ITEMS_PER_PAGE = 10
// Helper functions
const createKeywordSearchCondition = (keyword: string, searchOption: string): WhereCondition => {
const where: WhereCondition = {}
if (searchOption === 'all') {
where.OR = []
// 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 as any)) {
where[searchOption] = { contains: keyword }
} else if (searchOption === 'id') {
where.ID = { equals: Number(keyword) }
}
return where
}
const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
const where: WhereCondition = { AND: [] }
switch (params.memberRole) {
// 1차점: 같은 판매점에서 작성된 매물 + 2차점에서 제출받은 매물
case 'Admin':
where.OR = [
{
AND: [
{ STORE: { equals: params.store } },
{ SUBMISSION_STATUS: { equals: false } }
]
},
{
AND: [
{ STORE: { endsWith: params.store } },
{ SUBMISSION_STATUS: { equals: true } }
]
}
]
break
// 2차점: 같은 판매점에서 작성된 매물 + Builder에게 제출받은 매물
case 'Admin_Sub':
where.OR = [
{
AND: [
{ STORE: { equals: params.store } },
{ CONSTRUCTION_POINT: { equals: null } },
{ SUBMISSION_STATUS: { equals: false } }
]
},
{
AND: [
{ STORE: { equals: params.store } },
{ CONSTRUCTION_POINT: { not: null } },
{ SUBMISSION_STATUS: { equals: true } }
]
}
]
break
// 2차점 시공권한: 같은 시공ID에서 작성된 매물
case 'Builder':
where.AND?.push({
CONSTRUCTION_POINT: { equals: params.builderNo },
SUBMISSION_STATUS: { equals: false },
})
break
// 시공점: 같은 시공ID에서 작성된 매물
case 'Partner':
where.AND?.push({
CONSTRUCTION_POINT: { equals: params.builderNo },
SUBMISSION_STATUS: { equals: false },
})
break
// 모든 매물 조회 가능
case 'T01':
case 'User':
break
}
return where
}
// API Routes
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)
try {
const body = await request.json()
// @ts-ignore
const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({
data: body,
})
return NextResponse.json(res)
} catch (error) {
console.error('Error creating survey:', error)
return NextResponse.json({ error: 'Failed to create survey' }, { status: 500 })
}
}
export async function GET(request: Request) {
const { searchParams } = new URL(request.url)
const keyword = searchParams.get('keyword')
const searchOption = searchParams.get('searchOption')
const isMySurvey = searchParams.get('isMySurvey')
const sort = searchParams.get('sort')
const offset = searchParams.get('offset')
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']
try {
const where: any = {}
if (isMySurvey !== null && isMySurvey !== undefined) {
where.representative = isMySurvey
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'),
memberRole: searchParams.get('memberRole'),
store: searchParams.get('store'),
builderNo: searchParams.get('builderNo'),
}
if (keyword && keyword.trim() !== '' && searchOption) {
if (searchOption === 'all') {
where.OR = []
if (keyword.match(/^\d+$/) || !isNaN(Number(keyword))) {
where.OR.push({
id: {
equals: Number(keyword),
},
})
}
where.OR.push(
...searchOptions.map((field) => ({
[field]: {
contains: keyword,
},
})),
)
} else if (searchOptions.includes(searchOption)) {
where[searchOption] = {
contains: keyword,
}
} else if (searchOption === 'id') {
where[searchOption] = {
equals: Number(keyword),
}
}
const where: WhereCondition = {}
// 내가 작성한 매물 조건
if (params.isMySurvey) {
where.REPRESENTATIVE = params.isMySurvey
}
where.AND = []
if (store) {
where.AND.push({
store: {
equals: store,
},
})
}
if (construction_point) {
where.AND.push({
construction_point: {
equals: construction_point,
},
})
// 키워드 검색 조건
if (params.keyword && params.searchOption) {
Object.assign(where, createKeywordSearchCondition(params.keyword, params.searchOption))
}
if (offset) {
// 회원 유형 조건
Object.assign(where, createMemberRoleCondition(params))
// 데이터 조회
if (params.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' },
skip: Number(offset),
take: 10,
orderBy: params.sort === 'created' ? { REG_DT: 'desc' } : { UPT_DT: 'desc' },
skip: Number(params.offset),
take: ITEMS_PER_PAGE,
})
return NextResponse.json(res)
} else {
// @ts-ignore
const count = await prisma.SD_SERVEY_SALES_BASIC_INFO.count({
where,
})
return NextResponse.json(count)
}
// 전체 개수 조회
// @ts-ignore
const count = await prisma.SD_SURVEY_SALES_BASIC_INFO.count({ where })
return NextResponse.json(count)
} catch (error) {
console.error(error)
throw error
console.error('Error fetching surveys:', error)
return NextResponse.json({ error: 'Failed to fetch surveys' }, { status: 500 })
}
}
export async function PUT(request: Request) {
const body = await request.json()
const detailInfo = { ...body.detail_info, basic_info_id: body.id }
// @ts-ignore
const res = await prisma.SD_SERVEY_SALES_DETAIL_INFO.create({
data: detailInfo,
})
return NextResponse.json({ message: 'Survey sales updated successfully' })
try {
const body = await request.json()
const detailInfo = { ...body.detail_info, BASIC_INFO_ID: body.id }
// @ts-ignore
const res = await prisma.SD_SURVEY_SALES_DETAIL_INFO.create({
data: detailInfo,
})
return NextResponse.json({ message: 'Survey sales updated successfully' })
} catch (error) {
console.error('Error updating survey:', error)
return NextResponse.json({ error: 'Failed to update survey' }, { status: 500 })
}
}

View File

@ -28,7 +28,7 @@ export default async function RootLayout({ children, header, footer, floatBtn }:
const cookieStore = await cookies()
const session = await getIronSession<SessionData>(cookieStore, sessionOptions)
const sessionData = JSON.stringify(session)
const sessionData = session.isLoggedIn ? JSON.stringify(session) : ''
return (
<ReactQueryProviders>

View File

@ -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() {
<span className="text-red-500"></span>
</td>
) : (
<td>{surveyDetail?.id}</td>
<td>{surveyDetail?.ID}</td>
)}
</tr>
<tr>
<th></th>
<td>{surveyDetail?.created_at ? new Date(surveyDetail?.created_at).toLocaleString() : ''}</td>
<td>{surveyDetail?.REG_DT ? new Date(surveyDetail?.REG_DT).toLocaleString() : ''}</td>
</tr>
<tr>
<th></th>
<td>{surveyDetail?.updated_at ? new Date(surveyDetail?.updated_at).toLocaleString() : ''}</td>
<td>{surveyDetail?.UPT_DT ? new Date(surveyDetail?.UPT_DT).toLocaleString() : ''}</td>
</tr>
<tr>
<th></th>
<td>
{surveyDetail?.submission_status && surveyDetail?.submission_date ? (
{surveyDetail?.SUBMISSION_STATUS && surveyDetail?.SUBMISSION_DATE ? (
<>
{/* TODO: 제출한 판매점 ID 추가 필요 */}
<div>{new Date(surveyDetail.submission_date).toLocaleString()}</div>
<div>{new Date(surveyDetail.SUBMISSION_DATE).toLocaleString()}</div>
<div> ID...</div>
</>
) : (

View File

@ -8,20 +8,20 @@ export default function DetailButton({ isTemporary, surveyId, representative }:
const router = useRouter()
const { session } = useSessionStore()
const { submitSurvey, deleteSurvey } = useServey(surveyId)
const [userNm, setUserNm] = useState('')
const [userId, setUserId] = useState('')
useEffect(() => {
if (session?.isLoggedIn) {
setUserNm(session?.userNm ?? '')
setUserId(session?.userId ?? '')
}
}, [session, setUserNm])
}, [session, setUserId])
const handleSubmit = async () => {
if (isTemporary) {
alert('一時保存されたデータは提出できません。')
return
}
if (userNm === representative) {
if (userId === representative) {
if (confirm('提出しますか??')) {
if (surveyId) {
// TODO: 제출 페이지 추가
@ -34,7 +34,7 @@ export default function DetailButton({ isTemporary, surveyId, representative }:
}
}
const handleUpdate = () => {
if (userNm === representative) {
if (userId === representative) {
router.push(`/survey-sale/basic-info?id=${surveyId}&isTemp=${isTemporary}`)
} else {
alert('担当者のみ修正可能です。')
@ -43,7 +43,7 @@ export default function DetailButton({ isTemporary, surveyId, representative }:
const handleDelete = async () => {
if (confirm('削除しますか?')) {
if (surveyId) {
if (userNm === representative) {
if (userId === representative) {
await deleteSurvey()
router.push('/survey-sale')
} else {

View File

@ -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({
<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={surveyDetail?.representative} />
<input type="text" className="input-frame" disabled defaultValue={surveyDetail?.REPRESENTATIVE} />
</div>
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<input type="text" className="input-frame" disabled defaultValue={surveyDetail?.store ?? ''} />
<input type="text" className="input-frame" disabled defaultValue={surveyDetail?.STORE ?? ''} />
</div>
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<input type="text" className="input-frame" disabled defaultValue={surveyDetail?.construction_point ?? ''} />
<input type="text" className="input-frame" disabled defaultValue={surveyDetail?.CONSTRUCTION_POINT ?? ''} />
</div>
</div>
</div>
@ -45,18 +45,18 @@ export default function DetailForm({
<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={surveyDetail?.investigation_date ?? ''} />
<input type="text" className="input-frame" disabled defaultValue={surveyDetail?.INVESTIGATION_DATE ?? ''} />
</div>
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<input type="text" className="input-frame" disabled defaultValue={surveyDetail?.building_name ?? ''} />
<input type="text" className="input-frame" disabled defaultValue={surveyDetail?.BUILDING_NAME ?? ''} />
</div>
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<input type="text" className="input-frame" disabled defaultValue={surveyDetail?.customer_name ?? ''} />
<input type="text" className="input-frame" disabled defaultValue={surveyDetail?.CUSTOMER_NAME ?? ''} />
</div>
</div>
<DetailButton isTemporary={isTemporary} surveyId={Number(surveyDetail?.id)} representative={surveyDetail?.representative ?? ''} />
<DetailButton isTemporary={isTemporary} surveyId={Number(surveyDetail?.ID)} representative={surveyDetail?.REPRESENTATIVE ?? ''} />
</div>
</>
)

View File

@ -30,12 +30,12 @@ export default function RoofDetailForm({
<div className="data-input-form-bx">
{/* 전기 계약 용량 */}
<div className="data-input-form-tit"></div>
<input className="input-frame" type="text" placeholder="-" readOnly value={surveyDetail?.detail_info?.contract_capacity ?? ''} />
<input className="input-frame" type="text" placeholder="-" readOnly value={surveyDetail?.DETAIL_INFO?.CONTRACT_CAPACITY ?? ''} />
</div>
{/* 전기 소매 회사 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<input className="input-frame" type="text" placeholder="-" readOnly value={surveyDetail?.detail_info?.retail_company ?? ''} />
<input className="input-frame" type="text" placeholder="-" readOnly value={surveyDetail?.DETAIL_INFO?.RETAIL_COMPANY ?? ''} />
</div>
{/* 전기 부대 설비 */}
<div className="data-input-form-bx">
@ -46,7 +46,7 @@ export default function RoofDetailForm({
<input
type="checkbox"
id={`${item.id}`}
checked={makeNumArr(surveyDetail?.detail_info?.supplementary_facilities ?? '').includes(String(item.id))}
checked={makeNumArr(surveyDetail?.DETAIL_INFO?.SUPPLEMENTARY_FACILITIES ?? '').includes(String(item.id))}
readOnly
/>
<label htmlFor={`${item.id}`}>{item.name}</label>
@ -56,7 +56,7 @@ export default function RoofDetailForm({
<input
type="checkbox"
id={`supplementary_facilities_etc`}
checked={surveyDetail?.detail_info?.supplementary_facilities_etc !== null}
checked={surveyDetail?.DETAIL_INFO?.SUPPLEMENTARY_FACILITIES_ETC !== null}
readOnly
/>
<label htmlFor={`supplementary_facilities_etc`}> ()</label>
@ -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 ?? ''}
/>
</div>
</div>
{/* 설치 희망 시스템 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<SelectedBox column="installation_system" detailInfoData={surveyDetail?.detail_info ?? null} />
<SelectedBox column="INSTALLATION_SYSTEM" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 건축 연수 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<SelectedBox column="construction_year" detailInfoData={surveyDetail?.detail_info ?? null} />
<SelectedBox column="CONSTRUCTION_YEAR" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 지붕재 */}
<div className="data-input-form-bx">
@ -91,63 +91,63 @@ export default function RoofDetailForm({
<input
type="checkbox"
id={`${item.id}`}
checked={makeNumArr(surveyDetail?.detail_info?.roof_material ?? '').includes(String(item.id))}
checked={makeNumArr(surveyDetail?.DETAIL_INFO?.ROOF_MATERIAL ?? '').includes(String(item.id))}
readOnly
/>
<label htmlFor={`${item.id}`}>{item.name}</label>
</div>
))}
<div className="check-form-box">
<input type="checkbox" id={`roof_material_etc`} checked={surveyDetail?.detail_info?.roof_material_etc !== null} readOnly />
<input type="checkbox" id={`roof_material_etc`} checked={surveyDetail?.DETAIL_INFO?.ROOF_MATERIAL_ETC !== null} readOnly />
<label htmlFor={`roof_material_etc`}> ()</label>
</div>
</div>
<div className="data-input">
<input type="text" className="input-frame" placeholder="-" readOnly value={surveyDetail?.detail_info?.roof_material_etc ?? ''} />
<input type="text" className="input-frame" placeholder="-" readOnly value={surveyDetail?.DETAIL_INFO?.ROOF_MATERIAL_ETC ?? ''} />
</div>
</div>
{/* 지붕 모양 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<SelectedBox column="roof_shape" detailInfoData={surveyDetail?.detail_info ?? null} />
<SelectedBox column="ROOF_SHAPE" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 지붕 경사도 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<div className="data-input flex">
<input className="input-frame" type="text" placeholder="-" readOnly value={surveyDetail?.detail_info?.roof_slope ?? ''} />
<input className="input-frame" type="text" placeholder="-" readOnly value={surveyDetail?.DETAIL_INFO?.ROOF_SLOPE ?? ''} />
<span></span>
</div>
</div>
{/* 주택 구조 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<RadioSelected column="house_structure" detailInfoData={surveyDetail?.detail_info ?? null} />
<RadioSelected column="HOUSE_STRUCTURE" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 서까래 재질 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<RadioSelected column="rafter_material" detailInfoData={surveyDetail?.detail_info ?? null} />
<RadioSelected column="RAFTER_MATERIAL" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 서까래 크기 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<SelectedBox column="rafter_size" detailInfoData={surveyDetail?.detail_info ?? null} />
<SelectedBox column="RAFTER_SIZE" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 서까래 피치 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<SelectedBox column="rafter_pitch" detailInfoData={surveyDetail?.detail_info ?? null} />
<SelectedBox column="RAFTER_PITCH" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 서까래 방향 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<RadioSelected column="rafter_direction" detailInfoData={surveyDetail?.detail_info ?? null} />
<RadioSelected column="RAFTER_DIRECTION" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 노지판 종류 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<SelectedBox column="open_field_plate_kind" detailInfoData={surveyDetail?.detail_info ?? null} />
<SelectedBox column="OPEN_FIELD_PLATE_KIND" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 노지판 두께 */}
<div className="data-input-form-bx">
@ -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 ?? ''}
/>
<span>mm</span>
</div>
@ -166,37 +166,37 @@ export default function RoofDetailForm({
{/* 누수 흔적 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<RadioSelected column="leak_trace" detailInfoData={surveyDetail?.detail_info ?? null} />
<RadioSelected column="LEAK_TRACE" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 방수재 종류 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<RadioSelected column="waterproof_material" detailInfoData={surveyDetail?.detail_info ?? null} />
<RadioSelected column="WATERPROOF_MATERIAL" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 단열재 유무 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<RadioSelected column="insulation_presence" detailInfoData={surveyDetail?.detail_info ?? null} />
<RadioSelected column="INSULATION_PRESENCE" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 구조 순서 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<SelectedBox column="structure_order" detailInfoData={surveyDetail?.detail_info ?? null} />
<SelectedBox column="STRUCTURE_ORDER" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 설치 가능 여부 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<SelectedBox column="installation_availability" detailInfoData={surveyDetail?.detail_info ?? null} />
<SelectedBox column="INSTALLATION_AVAILABILITY" detailInfoData={surveyDetail?.DETAIL_INFO ?? null} />
</div>
{/* 메모 */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<div className="data-input">
<textarea className="textarea-form" placeholder="-" readOnly value={surveyDetail?.detail_info?.memo ?? ''} />
<textarea className="textarea-form" placeholder="-" readOnly value={surveyDetail?.DETAIL_INFO?.MEMO ?? ''} />
</div>
</div>
</div>
<DetailButton isTemporary={false} surveyId={Number(surveyDetail?.id)} representative={surveyDetail?.representative ?? ''} />
<DetailButton isTemporary={false} surveyId={Number(surveyDetail?.ID)} representative={surveyDetail?.REPRESENTATIVE ?? ''} />
</div>
</>
)
@ -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 (
<>
<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">
{typeof selectedId === 'number' ? selectBoxOptions[column as keyof typeof selectBoxOptions][selectedId]?.name : ''}
</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()} />}
</>
@ -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) => (
<div className="radio-form-box mb10" key={item.id}>
<input type="radio" name={column} id={`${item.id}`} disabled checked={selectedId === 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 !== 'rafter_direction' && column !== 'leak_trace' && column !== 'insulation_presence' && (
{column !== 'RAFTER_DIRECTION' && column !== 'LEAK_TRACE' && column !== 'INSULATION_PRESENCE' && (
<div className="radio-form-box mb10">
<input type="radio" name={column} id={`${column}_etc`} value="etc" disabled checked={etcChecked} />
<label htmlFor={`${column}_etc`}> ()</label>
<input type="radio" name={column} id={`${column}_ETC`} value="etc" disabled checked={etcChecked} />
<label htmlFor={`${column}_ETC`}> ()</label>
</div>
)}
{etcChecked && (

View File

@ -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()
@ -37,32 +37,34 @@ export default function BasicForm() {
const [basicInfoData, setBasicInfoData] = useState<SurveyBasicRequest>(defaultBasicInfoForm)
const { addressData } = useAddressStore()
const { userType, store, construction_point } = useUserType()
const { memberRole, store, builderNo } = useUserType()
const { session } = useSessionStore()
const popupController = usePopupController()
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?.userId ?? '',
STORE: store ?? '',
CONSTRUCTION_POINT: builderNo ?? '',
}))
}
setBasicInfoSelected()
}, [surveyDetail, addressData, session?.isLoggedIn, session?.userNm])
}, [surveyDetail, addressData, session?.isLoggedIn, session?.userNm, store, builderNo])
const focusInput = (input: keyof SurveyBasicRequest) => {
const inputElement = document.getElementById(input)
@ -117,11 +119,11 @@ 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?.userId ? session?.userId : basicInfoData.REPRESENTATIVE}
onChange={(e) => handleChange('REPRESENTATIVE', e.target.value)}
/>
</div>
{(userType === 'order' || userType?.includes('musubi')) && (
{(memberRole === 'Builder' || memberRole?.includes('Admin')) && (
<>
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
@ -129,21 +131,21 @@ 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)}
/>
</div>
</>
)}
{(userType === 'partner' || userType === 'musubi_con') && (
{(memberRole === 'Partner' || memberRole === 'Builder') && (
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<input
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={builderNo ? builderNo : basicInfoData.CONSTRUCTION_POINT ?? ''}
onChange={(e) => handleChange('CONSTRUCTION_POINT', e.target.value)}
/>
</div>
)}
@ -161,9 +163,9 @@ export default function BasicForm() {
<input
type="date"
className="date-frame"
id="investigation_date"
value={basicInfoData.investigation_date ?? ''}
onChange={(e) => handleChange('investigation_date', e.target.value)}
id="INVESTIGATION_DATE"
value={basicInfoData.INVESTIGATION_DATE ?? ''}
onChange={(e) => handleChange('INVESTIGATION_DATE', e.target.value)}
/>
</div>
</div>
@ -172,9 +174,9 @@ export default function BasicForm() {
<input
type="text"
className="input-frame"
id="building_name"
value={basicInfoData.building_name ?? ''}
onChange={(e) => handleChange('building_name', e.target.value)}
id="BUILDING_NAME"
value={basicInfoData.BUILDING_NAME ?? ''}
onChange={(e) => handleChange('BUILDING_NAME', e.target.value)}
/>
</div>
<div className="data-input-form-bx">
@ -182,24 +184,24 @@ export default function BasicForm() {
<input
type="text"
className="input-frame"
id="customer_name"
value={basicInfoData.customer_name ?? ''}
onChange={(e) => handleChange('customer_name', e.target.value)}
id="CUSTOMER_NAME"
value={basicInfoData.CUSTOMER_NAME ?? ''}
onChange={(e) => handleChange('CUSTOMER_NAME', e.target.value)}
/>
</div>
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
<div className="form-flex">
<div className="form-bx">
<input type="text" className="input-frame" id="post_code" value={basicInfoData.post_code ?? ''} readOnly />
<input type="text" className="input-frame" id="POST_CODE" value={basicInfoData.POST_CODE ?? ''} readOnly />
</div>
<div className="form-bx">
<select
className="select-form"
name="address"
id="address"
value={basicInfoData.address ?? ''}
onChange={(e) => handleChange('address', e.target.value)}
id="ADDRESS"
value={basicInfoData.ADDRESS ?? ''}
onChange={(e) => handleChange('ADDRESS', e.target.value)}
>
<option value=""></option>
</select>
@ -216,9 +218,9 @@ export default function BasicForm() {
<input
type="text"
className="input-frame"
id="address_detail"
value={basicInfoData.address_detail ?? ''}
onChange={(e) => handleChange('address_detail', e.target.value)}
id="ADDRESS_DETAIL"
value={basicInfoData.ADDRESS_DETAIL ?? ''}
onChange={(e) => handleChange('ADDRESS_DETAIL', e.target.value)}
/>
</div>
</div>

View File

@ -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<HTMLInputElement>) => {
@ -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' ? (
<>
<div className="data-input-form-tit">
<span></span>

View File

@ -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<RadioEtcKeys, string> = {
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<RadioEtcKeys, { id: number; label: string }[]> = {
house_structure: [
HOUSE_STRUCTURE: [
{
id: 1,
label: '木製',
},
],
rafter_material: [
RAFTER_MATERIAL: [
{
id: 1,
label: '木製',
@ -30,13 +30,13 @@ export const radioEtcData: Record<RadioEtcKeys, { id: number; label: string }[]>
label: '強制',
},
],
waterproof_material: [
WATERPROOF_MATERIAL: [
{
id: 1,
label: 'アスファルト屋根94022kg以上',
},
],
insulation_presence: [
INSULATION_PRESENCE: [
{
id: 1,
label: 'なし',
@ -46,7 +46,7 @@ export const radioEtcData: Record<RadioEtcKeys, { id: number; label: string }[]>
label: 'あり',
},
],
rafter_direction: [
RAFTER_DIRECTION: [
{
id: 1,
label: '垂直垂木',
@ -56,7 +56,7 @@ export const radioEtcData: Record<RadioEtcKeys, { id: number; label: string }[]>
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<HTMLInputElement>) => {
// 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<HTMLInputElement>) => {
@ -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()}
/>
<label htmlFor={`${column}_${item.id}`}>{item.label}</label>
</div>
))}
{column !== 'insulation_presence' && (
{column !== 'INSULATION_PRESENCE' && (
<div className="radio-form-box mb10">
<input type="radio" name={column} id={`${column}_etc`} value="etc" onChange={handleRadioChange} checked={isEtcSelected} />
<label htmlFor={`${column}_etc`}> ()</label>
<input type="radio" name={column} id={`${column}_ETC`} value="etc" onChange={handleRadioChange} checked={isEtcSelected} />
<label htmlFor={`${column}_ETC`}> ()</label>
</div>
)}
<div className="data-input">
<input
type="text"
className="input-frame"
disabled={column === 'insulation_presence' ? !isEtcSelected : !isEtcSelected}
disabled={column === 'INSULATION_PRESENCE' ? !isEtcSelected : !isEtcSelected}
value={etcValue}
onChange={handleEtcInputChange}
/>

View File

@ -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<SurveyDetailRequest>(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)}
/>
</div>
<div className="data-input">
<select
className="select-form"
name="contract_capacity_unit"
id="contract_capacity_unit"
name="CONTRACT_CAPACITY_UNIT"
id="CONTRACT_CAPACITY_UNIT"
onChange={(e) => handleUnitInput(e.target.value)}
value={detailInfoData.contract_capacity?.split(' ')[1] ?? ''}
value={detailInfoData.CONTRACT_CAPACITY?.split(' ')[1] ?? ''}
>
<option value="" hidden>
@ -177,16 +178,16 @@ export default function RoofInfoForm() {
<input
type="text"
className="input-frame"
value={detailInfoData.retail_company ?? ''}
onChange={(e) => handleTextInput('retail_company', e.target.value)}
value={detailInfoData.RETAIL_COMPANY ?? ''}
onChange={(e) => handleTextInput('RETAIL_COMPANY', e.target.value)}
/>
</div>
{/* 전기 부대 설비 - supplementary_facilities */}
<div className="data-input-form-bx">
<MultiCheckEtc column={'supplementary_facilities'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<MultiCheckEtc column={'SUPPLEMENTARY_FACILITIES'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
</div>
{/* 설치 희망 시스템 - installation_system */}
<SelectBoxEtc column={'installation_system'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<SelectBoxEtc column={'INSTALLATION_SYSTEM'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
</div>
</div>
@ -194,13 +195,13 @@ export default function RoofInfoForm() {
<div className="sale-roof-title"></div>
<div className="data-form-wrap">
{/* 건축 연수 - construction_year */}
<SelectBoxEtc column={'construction_year'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<SelectBoxEtc column={'CONSTRUCTION_YEAR'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
{/* 지붕재 - roof_material */}
<div className="data-input-form-bx">
<MultiCheckEtc column={'roof_material'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<MultiCheckEtc column={'ROOF_MATERIAL'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
</div>
{/* 지붕 모양 - roof_shape */}
<SelectBoxEtc column={'roof_shape'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<SelectBoxEtc column={'ROOF_SHAPE'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
{/* 지붕 경사도 - roof_slope */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
@ -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)}
/>
<span></span>
</div>
</div>
{/* 주택 구조 - house_structure */}
<RadioEtc column={'house_structure'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<RadioEtc column={'HOUSE_STRUCTURE'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
{/* 서까래 재질 - rafter_material */}
<RadioEtc column={'rafter_material'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<RadioEtc column={'RAFTER_MATERIAL'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
{/* 서까래 크기 - rafter_size */}
<SelectBoxEtc column={'rafter_size'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<SelectBoxEtc column={'RAFTER_SIZE'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
{/* 서까래 피치 - rafter_pitch */}
<SelectBoxEtc column={'rafter_pitch'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<SelectBoxEtc column={'RAFTER_PITCH'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
{/* 서까래 방향 - rafter_direction */}
<div className="data-input-form-bx">
<div className="data-input-form-tit red-f"></div>
@ -231,29 +232,29 @@ export default function RoofInfoForm() {
<div className="radio-form-box">
<input
type="radio"
name="rafter_direction"
id="rafter_direction_1"
name="RAFTER_DIRECTION"
id="RAFTER_DIRECTION_1"
value={1}
onChange={(e) => handleNumberInput('rafter_direction', Number(e.target.value))}
checked={detailInfoData.rafter_direction === 1}
onChange={(e) => handleNumberInput('RAFTER_DIRECTION', Number(e.target.value))}
checked={detailInfoData.RAFTER_DIRECTION === '1'}
/>
<label htmlFor="rafter_direction_1"></label>
<label htmlFor="RAFTER_DIRECTION_1"></label>
</div>
<div className="radio-form-box">
<input
type="radio"
name="rafter_direction"
id="rafter_direction_2"
name="RAFTER_DIRECTION"
id="RAFTER_DIRECTION_2"
value={2}
onChange={(e) => handleNumberInput('rafter_direction', Number(e.target.value))}
checked={detailInfoData.rafter_direction === 2}
onChange={(e) => handleNumberInput('RAFTER_DIRECTION', Number(e.target.value))}
checked={detailInfoData.RAFTER_DIRECTION === '2'}
/>
<label htmlFor="rafter_direction_2"></label>
<label htmlFor="RAFTER_DIRECTION_2"></label>
</div>
</div>
</div>
{/* 노지판 종류 - open_field_plate_kind */}
<SelectBoxEtc column={'open_field_plate_kind'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<SelectBoxEtc column={'OPEN_FIELD_PLATE_KIND'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
{/* 노지판 두께 - open_field_plate_thickness */}
<div className="data-input-form-bx">
<div className="data-input-form-tit">
@ -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)}
/>
<span>mm</span>
</div>
@ -278,33 +279,33 @@ export default function RoofInfoForm() {
<div className="radio-form-box">
<input
type="radio"
name="leak_trace"
id="leak_trace_1"
checked={detailInfoData.leak_trace === true}
onChange={(e) => handleBooleanInput('leak_trace', true)}
name="LEAK_TRACE"
id="LEAK_TRACE_1"
checked={detailInfoData.LEAK_TRACE === true}
onChange={(e) => handleBooleanInput('LEAK_TRACE', true)}
/>
<label htmlFor="leak_trace_1"></label>
<label htmlFor="LEAK_TRACE_1"></label>
</div>
<div className="radio-form-box">
<input
type="radio"
name="leak_trace"
id="leak_trace_2"
checked={detailInfoData.leak_trace === false}
onChange={(e) => handleBooleanInput('leak_trace', false)}
name="LEAK_TRACE"
id="LEAK_TRACE_2"
checked={detailInfoData.LEAK_TRACE === false}
onChange={(e) => handleBooleanInput('LEAK_TRACE', false)}
/>
<label htmlFor="leak_trace_2"></label>
<label htmlFor="LEAK_TRACE_2"></label>
</div>
</div>
</div>
{/* 방수재 종류 - waterproof_material */}
<RadioEtc column={'waterproof_material'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<RadioEtc column={'WATERPROOF_MATERIAL'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
{/* 단열재 유무 - insulation_presence */}
<RadioEtc column={'insulation_presence'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<RadioEtc column={'INSULATION_PRESENCE'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
{/* 노지판 종류 - open_field_plate_kind */}
<SelectBoxEtc column={'structure_order'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<SelectBoxEtc column={'STRUCTURE_ORDER'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
{/* 설치 가능 여부 - installation_availability */}
<SelectBoxEtc column={'installation_availability'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
<SelectBoxEtc column={'INSTALLATION_AVAILABILITY'} setDetailInfoData={setDetailInfoData} detailInfoData={detailInfoData} />
{/* 메모 - memo */}
<div className="data-input-form-bx">
<div className="data-input-form-tit"></div>
@ -320,10 +321,10 @@ export default function RoofInfoForm() {
<div className="data-input">
<textarea
className="textarea-form"
name="memo"
id="memo"
value={detailInfoData.memo ?? ''}
onChange={(e) => handleTextInput('memo', e.target.value)}
name="MEMO"
id="MEMO"
value={detailInfoData.MEMO ?? ''}
onChange={(e) => handleTextInput('MEMO', e.target.value)}
placeholder="例: 漏れの兆候があるため、正確な点検が必要です."
></textarea>
</div>

View File

@ -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<SelectBoxKeys, string> = {
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<SelectBoxKeys, string> = {
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<SelectBoxKeys, { id: number; name: string }[]> = {
installation_system: [
INSTALLATION_SYSTEM: [
{
id: 1,
name: '太陽光発電', //태양광발전
@ -48,7 +48,7 @@ export const selectBoxOptions: Record<SelectBoxKeys, { id: number; name: string
name: '蓄電池システム', //축전지시스템
},
],
construction_year: [
CONSTRUCTION_YEAR: [
{
id: 1,
name: '新築', //신축
@ -58,7 +58,7 @@ export const selectBoxOptions: Record<SelectBoxKeys, { id: number; name: string
name: '既築', //기존
},
],
roof_shape: [
ROOF_SHAPE: [
{
id: 1,
name: '切妻', //박공지붕
@ -72,7 +72,7 @@ export const selectBoxOptions: Record<SelectBoxKeys, { id: number; name: string
name: '片流れ', //한쪽흐름
},
],
rafter_size: [
RAFTER_SIZE: [
{
id: 1,
name: '幅35mm以上×高さ48mm以上',
@ -90,7 +90,7 @@ export const selectBoxOptions: Record<SelectBoxKeys, { id: number; name: string
name: '幅38mm以上×高さ40mm以上',
},
],
rafter_pitch: [
RAFTER_PITCH: [
{
id: 1,
name: '(455mm以下',
@ -104,7 +104,7 @@ export const selectBoxOptions: Record<SelectBoxKeys, { id: number; name: string
name: '606mm以下',
},
],
open_field_plate_kind: [
OPEN_FIELD_PLATE_KIND: [
{
id: 1,
name: '構造用合板', //구조용합판
@ -122,7 +122,7 @@ export const selectBoxOptions: Record<SelectBoxKeys, { id: number; name: string
name: '小幅板', //소판
},
],
structure_order: [
STRUCTURE_ORDER: [
{
id: 1,
name: '屋根材', //지붕재
@ -140,7 +140,7 @@ export const selectBoxOptions: Record<SelectBoxKeys, { id: number; name: string
name: '垂木', //서까래
},
],
installation_availability: [
INSTALLATION_AVAILABILITY: [
{
id: 1,
name: '確認済み', //확인완료
@ -165,35 +165,32 @@ export default function SelectBoxForm({
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 handleSelectChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
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<HTMLInputElement>) => {
@ -201,31 +198,31 @@ export default function SelectBoxForm({
setEtcValue(value)
setDetailInfoData({
...detailInfoData,
[`${column}_etc`]: value,
[`${column}_ETC`]: value,
})
}
return (
<>
<div className="data-input-form-bx">
<div className={font[column]}>{translateJapanese[column]}</div>
<div className={font[column as keyof typeof font]}>{translateJapanese[column as keyof typeof translateJapanese]}</div>
<div className="data-input mb5">
<select
className="select-form"
name={column}
id={column}
onChange={handleSelectChange}
value={detailInfoData[column] ? detailInfoData[column] : detailInfoData[`${column}_etc`] ? 'etc' : ''}
value={detailInfoData[column] ? detailInfoData[column] : detailInfoData[`${column}_ETC`] ? 'etc' : isEtcSelected ? 'etc' : ''}
>
<option value="" hidden>
</option>
{selectBoxOptions[column].map((option) => (
{selectBoxOptions[column as keyof typeof selectBoxOptions].map((option) => (
<option key={option.id} value={option.id}>
{option.name}
</option>
))}
{column !== 'installation_availability' && column !== 'construction_year' && <option value="etc"> ()</option>}
{column !== 'INSTALLATION_AVAILABILITY' && column !== 'CONSTRUCTION_YEAR' && <option value="etc"> ()</option>}
</select>
</div>
<div className="data-input">
@ -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
}
/>

View File

@ -6,7 +6,8 @@ import { useEffect, useState } from 'react'
import { useRouter } from 'next/navigation'
import SearchForm from './SearchForm'
import { useSurveyFilterStore } from '@/store/surveyFilterStore'
import { UserType } from '@/hooks/useUserType'
import { MemberRole } from '@/hooks/useUserType'
import { useSessionStore } from '@/store/session'
export default function ListTable() {
const router = useRouter()
@ -15,7 +16,9 @@ export default function ListTable() {
const [heldSurveyList, setHeldSurveyList] = useState<typeof surveyList>([])
const [hasMore, setHasMore] = useState(false)
const [memberType, setMemberType] = useState<UserType>('hwj')
const [memberRole, setMemberRole] = useState<MemberRole>()
const { session } = useSessionStore()
useEffect(() => {
if (surveyList && surveyList.length > 0) {
@ -29,9 +32,8 @@ export default function ListTable() {
}
setHasMore(surveyListCount > offset + 10)
}
// 회원 유형 설정 이후 변경
setMemberType('hwj')
}, [surveyList, surveyListCount, offset])
setMemberRole(session.role as MemberRole)
}, [surveyList, surveyListCount, offset, session])
const handleDetailClick = (id: number) => {
router.push(`/survey-sale/${id}`)
@ -45,22 +47,22 @@ export default function ListTable() {
return (
<>
<SearchForm onItemsInit={handleItemsInit} memberType={memberType} />
<SearchForm onItemsInit={handleItemsInit} memberRole={memberRole as MemberRole} />
{heldSurveyList.length > 0 ? (
<div className="sale-frame">
<ul className="sale-list-wrap">
{heldSurveyList.map((survey) => (
<li className="sale-list-item cursor-pointer" key={survey.id} onClick={() => handleDetailClick(survey.id)}>
<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-date">{survey.investigation_date}</div>
<div className="sale-item-num">{survey.ID}</div>
<div className="sale-item-date">{survey.INVESTIGATION_DATE}</div>
</div>
<div className="sale-item-tit">{survey.building_name}</div>
<div className="sale-item-customer">{survey.customer_name}</div>
<div className="sale-item-tit">{survey.BUILDING_NAME}</div>
<div className="sale-item-customer">{survey.CUSTOMER_NAME}</div>
<div className="sale-item-update-bx">
<div className="sale-item-name">{survey.representative}</div>
<div className="sale-item-update">{new Date(survey.updated_at).toLocaleString()}</div>
<div className="sale-item-name">{survey.REPRESENTATIVE}</div>
<div className="sale-item-update">{new Date(survey.UPT_DT).toLocaleString()}</div>
</div>
</div>
</li>

View File

@ -1,11 +1,11 @@
'use client'
import { SEARCH_OPTIONS, SEARCH_OPTIONS_ENUM, SEARCH_OPTIONS_PARTNERS, useSurveyFilterStore } from '@/store/surveyFilterStore'
import { UserType } from '@/hooks/useUserType'
import { MemberRole } from '@/hooks/useUserType'
import { useRouter } from 'next/navigation'
import { useState } from 'react'
export default function SearchForm({ onItemsInit, memberType }: { onItemsInit: () => void; memberType: UserType }) {
export default function SearchForm({ onItemsInit, memberRole }: { onItemsInit: () => void; memberRole: MemberRole }) {
const router = useRouter()
const { setSearchOption, setSort, setIsMySurvey, setKeyword, isMySurvey, keyword, searchOption, sort } = useSurveyFilterStore()
const [searchKeyword, setSearchKeyword] = useState(keyword)
@ -20,7 +20,7 @@ export default function SearchForm({ onItemsInit, memberType }: { onItemsInit: (
setKeyword(searchKeyword)
onItemsInit()
}
const searchOptions = memberType === 'partner' ? SEARCH_OPTIONS_PARTNERS : SEARCH_OPTIONS
const searchOptions = memberRole === 'Partner' ? SEARCH_OPTIONS_PARTNERS : SEARCH_OPTIONS
return (
<div className="sale-frame">

View File

@ -1,10 +1,19 @@
'use client'
import { usePopupController } from '@/store/popupController'
import React from 'react'
export default function DoubleBtnAlert() {
const { alertMsg, alert2BtnYes, alert2BtnNo } = usePopupController()
const { alertMsg, alert2BtnYes, alert2BtnNo, setAlert2 } = usePopupController()
const handleAlert2BtnYes = () => {
alert2BtnYes()
setAlert2(false)
}
const handleAlert2BtnNo = () => {
alert2BtnNo()
setAlert2(false)
}
return (
<div className="modal-popup alert">
@ -13,12 +22,12 @@ export default function DoubleBtnAlert() {
<div className="alert-tit">{alertMsg}</div>
<div className="alert-btn-wrap">
<div className="alert-btn-bx">
<button className="btn-frame red min" onClick={() => alert2BtnYes()}>
<button className="btn-frame red min" onClick={() => handleAlert2BtnYes()}>
</button>
</div>
<div className="alert-btn-bx">
<button className="btn-frame n-blue min" onClick={() => alert2BtnNo()}>
<button className="btn-frame n-blue min" onClick={() => handleAlert2BtnNo()}>
</button>
</div>

View File

@ -120,7 +120,7 @@ export default function Header() {
</button>
</li>
<li className="side-footer-item">
<button>Jynoadmin</button>
<button>{session.userId}</button>
</li>
<li className="side-footer-item">
<button onClick={() => router.push('/')}>HOME</button>

30
src/hooks/useSuitable.ts Normal file
View File

@ -0,0 +1,30 @@
import { suitableApi } from '@/api/suitable'
export function useSuitable() {
const getCategories = async () => {
try {
return await suitableApi.getCategory()
} catch (error) {
console.error('카테고리 데이터 로드 실패:', error)
return []
}
}
const getSuitables = async () => {
try {
return await suitableApi.getList()
} catch (error) {
console.error('지붕재 데이터 로드 실패:', error)
}
}
const updateSearchResults = async (selectedCategory: string | undefined, searchValue: string | undefined) => {
try {
return await suitableApi.getList(selectedCategory, searchValue)
} catch (error) {
console.error('지붕재 데이터 검색 실패:', error)
}
}
return { getCategories, getSuitables, updateSearchResults }
}

View File

@ -41,13 +41,13 @@ export function useServey(id?: number): {
} {
const queryClient = useQueryClient()
const { keyword, searchOption, isMySurvey, sort, offset } = useSurveyFilterStore()
const { store, construction_point } = useUserType()
const { store, builderNo, memberRole } = useUserType()
const { data: surveyList, isLoading: isLoadingSurveyList } = useQuery({
queryKey: ['survey', 'list', keyword, searchOption, isMySurvey, sort, offset, store, construction_point],
queryKey: ['survey', 'list', keyword, searchOption, isMySurvey, sort, offset, store, builderNo, memberRole],
queryFn: async () => {
const resp = await axiosInstance(null).get<SurveyBasicInfo[]>('/api/survey-sales', {
params: { keyword, searchOption, isMySurvey, sort, offset, store, construction_point },
params: { keyword, searchOption, isMySurvey, sort, offset, store, builderNo, memberRole },
})
return resp.data
},
@ -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<SurveyBasicInfo>('/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 || ''

View File

@ -1,24 +1,31 @@
import { useSessionStore } from '@/store/session'
import { useEffect, useState } from 'react'
export type UserType = 'hwj' | 'order' | 'musubi' | 'musubi_con' | 'partner'
export type MemberRole = 'T01' | 'Admin' | 'Admin_Sub' | 'Builder' | 'Partner' | 'User'
// TO1 - else
// Admin - 1차점, Admin_Sub - 2차점, Builder - 2차점 시공사, Partner - 파트너사, User - else
// 로그인 된 회원 유형에 따라 조사 매물 목록 변경됨
export function useUserType() {
const { session } = useSessionStore()
const [userType, setUserType] = useState<UserType | null>(null)
const [memberRole, setMemberRole] = useState<MemberRole | null>(null)
const [store, setStore] = useState<string | null>(null)
const [construction_point, setConstructionPoint] = useState<string | null>(null)
const [builderNo, setBuilderNo] = useState<string | null>(null)
// TODO: 회원 유형 설정
useEffect(() => {
if (!session?.isLoggedIn) return
setUserType('musubi_con')
setMemberRole(session.role as MemberRole)
if (session.role === 'T01') {
setStore(null)
} else {
setStore(session.storeId)
}
setBuilderNo(session.builderNo)
}, [session])
return {
userType,
memberRole,
store,
construction_point,
builderNo,
}
}

View File

@ -7,6 +7,12 @@ import { usePathname } from 'next/navigation'
import { useEffect } from 'react'
import { useSessionStore } from '@/store/session'
declare global {
interface Window {
neoConfirm: (msg?: string, alertBtn2Yes?: Function, alertBtn2No?: Function) => boolean
}
}
interface EdgeProviderProps {
children: React.ReactNode
sessionData: string
@ -44,29 +50,24 @@ export default function EdgeProvider({ children, sessionData }: EdgeProviderProp
setAlert2(true)
}
//alert 함수 변경해서 바인딩
useEffect(() => {
//alert 함수 변경해서 바인딩
window.alert = function (msg, alertBtn = () => setAlert(false)) {
alertFunc(msg, alertBtn)
}
window.confirm = function (msg = '', alert2BtnYes = () => setAlert2(false), alert2BtnNo = () => setAlert2(false)) {
alertFunc2(
msg,
() => {
alert2BtnYes()
return true
},
() => {
alert2BtnNo()
return false
},
)
// confirm 함수 변경해서 바인딩
window.neoConfirm = function (msg: string | undefined, alertBtn2Yes?: Function, alertBtn2No?: Function) {
if (!msg) return false
alertFunc2(msg, alertBtn2Yes || (() => {}), alertBtn2No || (() => {}))
return false
}
setSession({
...session,
...JSON.parse(sessionData),
})
// 서버 세션이 있으면 zuatand 세션 데이터 갱신
if (sessionData && sessionData !== '') {
setSession({
...session,
...JSON.parse(sessionData),
})
}
}, [])
/**

View File

@ -41,6 +41,7 @@ const initialState: InitialState = {
custCd: null,
builderNo: null,
isLoggedIn: false,
role: null,
},
}

View File

@ -0,0 +1,68 @@
import { create } from 'zustand'
import { Suitable, suitableApi } from '@/api/suitable'
interface SuitableState {
// // 검색 결과 리스트
// searchResults: Suitable[]
// // 초기 데이터 로드
// fetchInitializeData: () => Promise<void>
// // 검색 결과 설정
// setSearchResults: (results: Suitable[]) => void
// // 검색 결과 초기화
// resetSearchResults: () => void
// 선택된 아이템 리스트
selectedItems: Suitable[]
// 선택된 아이템 추가
addSelectedItem: (item: Suitable) => void
// 선택된 아이템 제거
removeSelectedItem: (itemId: number) => void
// 선택된 아이템 모두 제거
clearSelectedItems: () => void
}
export const useSuitableStore = create<SuitableState>((set) => ({
// // 초기 상태
// searchResults: [],
// // 초기 데이터 로드
// fetchInitializeData: async () => {
// const suitables = await fetchInitialSuitablee()
// set({ searchResults: suitables })
// },
// // 검색 결과 설정
// setSearchResults: (results) => set({ searchResults: results }),
// // 검색 결과 초기화
// resetSearchResults: () => set({ searchResults: [] }),
// 초기 상태
selectedItems: [],
// 선택된 아이템 추가 (중복 방지)
addSelectedItem: (item) =>
set((state) => ({
selectedItems: state.selectedItems.some((i) => i.id === item.id) ? state.selectedItems : [...state.selectedItems, item],
})),
// 선택된 아이템 제거
removeSelectedItem: (itemId) =>
set((state) => ({
selectedItems: state.selectedItems.filter((item) => item.id !== itemId),
})),
// 선택된 아이템 모두 제거
clearSelectedItems: () => set({ selectedItems: [] }),
}))
// // 전체 데이터 초기화 함수
// async function fetchInitialSuitablee() {
// try {
// const suitable = await suitableApi.getList()
// return suitable
// } catch (error) {
// console.error('초기 데이터 로드 실패:', error)
// return []
// }
// }

View File

@ -27,4 +27,5 @@ export interface SessionData {
custCd: null
builderNo: null
isLoggedIn: boolean
role: string | null
}

View File

@ -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
}

7
src/utils/window.ts Normal file
View File

@ -0,0 +1,7 @@
export const confirmParamsSerialize = ({ msg, yes, no }: { msg: string; yes: () => void; no: () => void }) => {
return JSON.stringify({ msg, yes, no })
}
export const confirmParamsDeserialize = (params: string) => {
return JSON.parse(params)
}