hyungi/tk-factory-services
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(tkpurchase): 협력업체 작업 신청 기능 추가

Browse Source 
협력업체 포탈에서 오늘 일정이 없을 때 직접 작업을 신청할 수 있는 기능.
구매팀이 승인하면 일정이 생성되고, 반려 시 재신청 가능.

- DB: status ENUM에 requested/rejected 추가, requested_by 컬럼 추가
- API: POST /schedules/request, PUT /:id/approve, PUT /:id/reject
- 포탈: 신청 폼 + 승인 대기/반려 상태 카드
- 관리자: 신청 배지 + 승인 모달 (프로젝트 배정, 작업장 보정)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Hyungi Ahn
2026-03-13 14:40:20 +09:00
parent 03119a0849
commit 0211889636
9 changed files with 352 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tkpurchase/api/models/scheduleModel.js
View File

@@ -45,6 +45,19 @@ async function findByCompanyToday(companyId) {
LEFT JOIN partner_companies pc ON ps.company_id = pc.id
LEFT JOIN projects p ON ps.project_id = p.project_id
WHERE ps.company_id = ? AND ps.start_date <= CURDATE() AND ps.end_date >= CURDATE()
AND ps.status NOT IN ('cancelled','rejected','requested')
ORDER BY ps.created_at DESC`, [companyId]);
return rows;
}
async function findRequestsByCompany(companyId) {
const db = getPool();
const [rows] = await db.query(
`SELECT ps.*, pc.company_name, su.name AS requested_by_name
FROM partner_schedules ps
LEFT JOIN partner_companies pc ON ps.company_id = pc.id
LEFT JOIN sso_users su ON ps.requested_by = su.user_id
WHERE ps.company_id = ? AND ps.status IN ('requested','rejected')
ORDER BY ps.created_at DESC`, [companyId]);
return rows;
}
@@ -63,13 +76,14 @@ async function findByProject(projectId) {
async function create(data) {
const db = getPool();
const [result] = await db.query(
`INSERT INTO partner_schedules (company_id, project_id, start_date, end_date, work_description, workplace_name, expected_workers, registered_by, notes)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
`INSERT INTO partner_schedules (company_id, project_id, start_date, end_date, work_description, workplace_name, expected_workers, registered_by, requested_by, status, notes)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
[data.company_id, data.project_id || null,
data.start_date, data.end_date || data.start_date,
data.work_description || null,
data.workplace_name || null, data.expected_workers || null,
data.registered_by, data.notes || null]);
data.registered_by || null, data.requested_by || null,
data.status || 'scheduled', data.notes || null]);
return findById(result.insertId);
}
@@ -103,4 +117,4 @@ async function deleteSchedule(id) {
await db.query('DELETE FROM partner_schedules WHERE id = ?', [id]);
}
module.exports = { findAll, findById, findByCompanyToday, findByProject, create, update, updateStatus, deleteSchedule };
module.exports = { findAll, findById, findByCompanyToday, findRequestsByCompany, findByProject, create, update, updateStatus, deleteSchedule };