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

fix: 배포 후 버그 수정 — 테이블명/컬럼명 불일치, navbar active, API 검증 강화, 대시보드 통계 라우트 추가

Browse Source 
- checkinModel: partner_checkins → partner_work_checkins, countActive() 추가
- workReportModel: partner_work_reports → daily_work_reports
- partner-portal: check_out_at/check_in_at → check_out_time/check_in_time
- checkinModel findTodayByCompany: LEFT JOIN has_work_report
- tkpurchase-core/tksafety-core: navbar match '' 제거
- checkinController: checkOut에 업무현황 검증, stats() 추가
- workReportController: checkin_id 필수 + schedule 일치 검증
- checkinRoutes: GET / 대시보드 통계 라우트 추가
- nginx.conf: visit.html → tksafety 리다이렉트
- migration-purchase-safety.sql: DDL 동기화
- migration-purchase-safety-patch.sql: 신규 패치

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Hyungi Ahn
2026-03-13 07:22:25 +09:00
parent b800792152
commit efc3c14db5
11 changed files with 77 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tkpurchase/api/models/checkinModel.js
View File

@@ -4,7 +4,7 @@ async function findBySchedule(scheduleId) {
const db = getPool();
const [rows] = await db.query(
`SELECT pc.*, pco.company_name, su.name AS checked_by_name
FROM partner_checkins pc
FROM partner_work_checkins pc
LEFT JOIN partner_companies pco ON pc.company_id = pco.id
LEFT JOIN sso_users su ON pc.checked_by = su.user_id
WHERE pc.schedule_id = ?
@@ -16,7 +16,7 @@ async function findById(id) {
const db = getPool();
const [rows] = await db.query(
`SELECT pc.*, pco.company_name, su.name AS checked_by_name
FROM partner_checkins pc
FROM partner_work_checkins pc
LEFT JOIN partner_companies pco ON pc.company_id = pco.id
LEFT JOIN sso_users su ON pc.checked_by = su.user_id
WHERE pc.id = ?`, [id]);
@@ -26,9 +26,11 @@ async function findById(id) {
async function findTodayByCompany(companyId) {
const db = getPool();
const [rows] = await db.query(
`SELECT pc.*, ps.work_description, ps.workplace_name
FROM partner_checkins pc
`SELECT pc.*, ps.work_description, ps.workplace_name,
(dwr.id IS NOT NULL) AS has_work_report
FROM partner_work_checkins pc
LEFT JOIN partner_schedules ps ON pc.schedule_id = ps.id
LEFT JOIN daily_work_reports dwr ON dwr.checkin_id = pc.id
WHERE pc.company_id = ? AND DATE(pc.check_in_time) = CURDATE()
ORDER BY pc.check_in_time DESC`, [companyId]);
return rows;
@@ -37,7 +39,7 @@ async function findTodayByCompany(companyId) {
async function checkIn(data) {
const db = getPool();
const [result] = await db.query(
`INSERT INTO partner_checkins (schedule_id, company_id, checked_by, check_in_time, worker_names, actual_worker_count, notes)
`INSERT INTO partner_work_checkins (schedule_id, company_id, checked_by, check_in_time, worker_names, actual_worker_count, notes)
VALUES (?, ?, ?, NOW(), ?, ?, ?)`,
[data.schedule_id, data.company_id, data.checked_by,
data.worker_names ? JSON.stringify(data.worker_names) : null,
@@ -47,7 +49,7 @@ async function checkIn(data) {
async function checkOut(id) {
const db = getPool();
await db.query('UPDATE partner_checkins SET check_out_time = NOW() WHERE id = ? AND check_out_time IS NULL', [id]);
await db.query('UPDATE partner_work_checkins SET check_out_time = NOW() WHERE id = ? AND check_out_time IS NULL', [id]);
return findById(id);
}
@@ -60,8 +62,16 @@ async function update(id, data) {
if (data.notes !== undefined) { fields.push('notes = ?'); values.push(data.notes || null); }
if (fields.length === 0) return findById(id);
values.push(id);
await db.query(`UPDATE partner_checkins SET ${fields.join(', ')} WHERE id = ?`, values);
await db.query(`UPDATE partner_work_checkins SET ${fields.join(', ')} WHERE id = ?`, values);
return findById(id);
}
module.exports = { findBySchedule, findById, findTodayByCompany, checkIn, checkOut, update };
async function countActive() {
const db = getPool();
const [rows] = await db.query(
`SELECT COUNT(*) AS cnt FROM partner_work_checkins
WHERE check_out_time IS NULL AND DATE(check_in_time) = CURDATE()`);
return rows[0].cnt;
}
module.exports = { findBySchedule, findById, findTodayByCompany, checkIn, checkOut, update, countActive };