feat: tkpurchase 시스템 Phase 1 - 협력업체 마스터 + 당일 방문 관리
신규 독립 시스템 tkpurchase (구매/방문 관리) 구축: - 협력업체 CRUD + 소속 작업자 관리 (마스터 데이터 소유) - 당일 방문 등록/체크인/체크아웃 + 일괄 마감 - 업체 자동완성, CSV 내보내기, 집계 통계 - 자정 자동 체크아웃 (node-cron) - tkuser 협력업체 읽기 전용 탭 + 권한 그리드(tkpurchase-perms) 추가 - docker-compose에 tkpurchase-api/web 서비스 추가 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Hyungi Ahn
181
tkpurchase/api/models/dailyVisitModel.js
Normal file
181
tkpurchase/api/models/dailyVisitModel.js
Normal file
@@ -0,0 +1,181 @@
|
||||
const { getPool } = require('./partnerModel');
|
||||
|
||||
async function findToday() {
|
||||
const db = getPool();
|
||||
const [rows] = await db.query(
|
||||
`SELECT dv.*, pc.company_name AS partner_company_name
|
||||
FROM daily_visits dv
|
||||
LEFT JOIN partner_companies pc ON dv.company_id = pc.id
|
||||
WHERE dv.visit_date = CURDATE()
|
||||
ORDER BY dv.check_in_time DESC`
|
||||
);
|
||||
return rows;
|
||||
}
|
||||
|
||||
async function getTodayStats() {
|
||||
const db = getPool();
|
||||
const [rows] = await db.query(
|
||||
`SELECT
|
||||
COUNT(*) AS total,
|
||||
SUM(CASE WHEN status = 'checked_in' THEN 1 ELSE 0 END) AS checked_in,
|
||||
SUM(CASE WHEN status IN ('checked_out','auto_checkout') THEN 1 ELSE 0 END) AS checked_out,
|
||||
SUM(CASE WHEN status = 'cancelled' THEN 1 ELSE 0 END) AS cancelled,
|
||||
SUM(visitor_count) AS total_visitors
|
||||
FROM daily_visits WHERE visit_date = CURDATE()`
|
||||
);
|
||||
return rows[0];
|
||||
}
|
||||
|
||||
async function findAll({ visit_date, date_from, date_to, company_id, purpose, status, page = 1, limit = 50 } = {}) {
|
||||
const db = getPool();
|
||||
let sql = `SELECT dv.*, pc.company_name AS partner_company_name
|
||||
FROM daily_visits dv
|
||||
LEFT JOIN partner_companies pc ON dv.company_id = pc.id WHERE 1=1`;
|
||||
const params = [];
|
||||
if (visit_date) { sql += ' AND dv.visit_date = ?'; params.push(visit_date); }
|
||||
if (date_from) { sql += ' AND dv.visit_date >= ?'; params.push(date_from); }
|
||||
if (date_to) { sql += ' AND dv.visit_date <= ?'; params.push(date_to); }
|
||||
if (company_id) { sql += ' AND dv.company_id = ?'; params.push(company_id); }
|
||||
if (purpose) { sql += ' AND dv.purpose = ?'; params.push(purpose); }
|
||||
if (status) { sql += ' AND dv.status = ?'; params.push(status); }
|
||||
sql += ' ORDER BY dv.visit_date DESC, dv.check_in_time DESC';
|
||||
const offset = (page - 1) * limit;
|
||||
sql += ' LIMIT ? OFFSET ?';
|
||||
params.push(limit, offset);
|
||||
const [rows] = await db.query(sql, params);
|
||||
return rows;
|
||||
}
|
||||
|
||||
async function findById(id) {
|
||||
const db = getPool();
|
||||
const [rows] = await db.query(
|
||||
`SELECT dv.*, pc.company_name AS partner_company_name
|
||||
FROM daily_visits dv
|
||||
LEFT JOIN partner_companies pc ON dv.company_id = pc.id
|
||||
WHERE dv.id = ?`,
|
||||
[id]
|
||||
);
|
||||
return rows[0] || null;
|
||||
}
|
||||
|
||||
async function create(data) {
|
||||
const db = getPool();
|
||||
const [result] = await db.query(
|
||||
`INSERT INTO daily_visits (visit_date, company_id, company_name, visitor_name, visitor_count,
|
||||
purpose, purpose_detail, workplace_name, safety_education_yn, vehicle_number,
|
||||
check_in_time, notes, managing_department, registered_by)
|
||||
VALUES (CURDATE(), ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), ?, ?, ?)`,
|
||||
[data.company_id || null, data.company_name || null, data.visitor_name, data.visitor_count || 1,
|
||||
data.purpose, data.purpose_detail || null, data.workplace_name || null,
|
||||
data.safety_education_yn || false, data.vehicle_number || null,
|
||||
data.notes || null, data.managing_department || null, data.registered_by]
|
||||
);
|
||||
// 개별 인원 명단 (선택)
|
||||
if (data.workers && data.workers.length > 0) {
|
||||
for (const w of data.workers) {
|
||||
await db.query(
|
||||
'INSERT INTO daily_visit_workers (daily_visit_id, partner_worker_id, worker_name) VALUES (?, ?, ?)',
|
||||
[result.insertId, w.partner_worker_id || null, w.worker_name]
|
||||
);
|
||||
}
|
||||
}
|
||||
return findById(result.insertId);
|
||||
}
|
||||
|
||||
async function update(id, data) {
|
||||
const db = getPool();
|
||||
const fields = [];
|
||||
const values = [];
|
||||
if (data.company_id !== undefined) { fields.push('company_id = ?'); values.push(data.company_id || null); }
|
||||
if (data.company_name !== undefined) { fields.push('company_name = ?'); values.push(data.company_name || null); }
|
||||
if (data.visitor_name !== undefined) { fields.push('visitor_name = ?'); values.push(data.visitor_name); }
|
||||
if (data.visitor_count !== undefined) { fields.push('visitor_count = ?'); values.push(data.visitor_count); }
|
||||
if (data.purpose !== undefined) { fields.push('purpose = ?'); values.push(data.purpose); }
|
||||
if (data.purpose_detail !== undefined) { fields.push('purpose_detail = ?'); values.push(data.purpose_detail || null); }
|
||||
if (data.workplace_name !== undefined) { fields.push('workplace_name = ?'); values.push(data.workplace_name || null); }
|
||||
if (data.safety_education_yn !== undefined) { fields.push('safety_education_yn = ?'); values.push(data.safety_education_yn); }
|
||||
if (data.vehicle_number !== undefined) { fields.push('vehicle_number = ?'); values.push(data.vehicle_number || null); }
|
||||
if (data.notes !== undefined) { fields.push('notes = ?'); values.push(data.notes || null); }
|
||||
if (data.managing_department !== undefined) { fields.push('managing_department = ?'); values.push(data.managing_department || null); }
|
||||
if (data.status !== undefined) { fields.push('status = ?'); values.push(data.status); }
|
||||
if (fields.length === 0) return findById(id);
|
||||
values.push(id);
|
||||
await db.query(`UPDATE daily_visits SET ${fields.join(', ')} WHERE id = ?`, values);
|
||||
return findById(id);
|
||||
}
|
||||
|
||||
async function checkout(id, note) {
|
||||
const db = getPool();
|
||||
await db.query(
|
||||
`UPDATE daily_visits SET status = 'checked_out', check_out_time = NOW(), checkout_note = ? WHERE id = ? AND status = 'checked_in'`,
|
||||
[note || null, id]
|
||||
);
|
||||
return findById(id);
|
||||
}
|
||||
|
||||
async function bulkCheckout() {
|
||||
const db = getPool();
|
||||
const [result] = await db.query(
|
||||
`UPDATE daily_visits SET status = 'checked_out', check_out_time = NOW() WHERE visit_date = CURDATE() AND status = 'checked_in'`
|
||||
);
|
||||
return result;
|
||||
}
|
||||
|
||||
async function autoCheckoutAll() {
|
||||
const db = getPool();
|
||||
const [result] = await db.query(
|
||||
`UPDATE daily_visits SET status = 'auto_checkout', check_out_time = NOW() WHERE visit_date = CURDATE() AND status = 'checked_in'`
|
||||
);
|
||||
return result;
|
||||
}
|
||||
|
||||
async function deleteVisit(id) {
|
||||
const db = getPool();
|
||||
await db.query('DELETE FROM daily_visit_workers WHERE daily_visit_id = ?', [id]);
|
||||
await db.query('DELETE FROM daily_visits WHERE id = ?', [id]);
|
||||
}
|
||||
|
||||
async function getStats({ date_from, date_to } = {}) {
|
||||
const db = getPool();
|
||||
const params = [];
|
||||
let dateFilter = '';
|
||||
if (date_from) { dateFilter += ' AND visit_date >= ?'; params.push(date_from); }
|
||||
if (date_to) { dateFilter += ' AND visit_date <= ?'; params.push(date_to); }
|
||||
|
||||
const [byPurpose] = await db.query(
|
||||
`SELECT purpose, COUNT(*) AS cnt, SUM(visitor_count) AS total_visitors FROM daily_visits WHERE 1=1 ${dateFilter} GROUP BY purpose ORDER BY cnt DESC`,
|
||||
params
|
||||
);
|
||||
const [byCompany] = await db.query(
|
||||
`SELECT COALESCE(pc.company_name, dv.company_name, '미등록') AS company, COUNT(*) AS cnt, SUM(dv.visitor_count) AS total_visitors
|
||||
FROM daily_visits dv LEFT JOIN partner_companies pc ON dv.company_id = pc.id WHERE 1=1 ${dateFilter} GROUP BY company ORDER BY cnt DESC LIMIT 20`,
|
||||
params
|
||||
);
|
||||
const [byDate] = await db.query(
|
||||
`SELECT visit_date, COUNT(*) AS cnt, SUM(visitor_count) AS total_visitors FROM daily_visits WHERE 1=1 ${dateFilter} GROUP BY visit_date ORDER BY visit_date DESC LIMIT 30`,
|
||||
params
|
||||
);
|
||||
return { byPurpose, byCompany, byDate };
|
||||
}
|
||||
|
||||
async function exportCsv({ date_from, date_to, company_id, purpose } = {}) {
|
||||
const db = getPool();
|
||||
let sql = `SELECT dv.visit_date, COALESCE(pc.company_name, dv.company_name, '') AS company,
|
||||
dv.visitor_name, dv.visitor_count, dv.purpose, dv.purpose_detail, dv.workplace_name,
|
||||
dv.safety_education_yn, dv.vehicle_number, dv.check_in_time, dv.check_out_time,
|
||||
dv.status, dv.managing_department, dv.notes
|
||||
FROM daily_visits dv LEFT JOIN partner_companies pc ON dv.company_id = pc.id WHERE 1=1`;
|
||||
const params = [];
|
||||
if (date_from) { sql += ' AND dv.visit_date >= ?'; params.push(date_from); }
|
||||
if (date_to) { sql += ' AND dv.visit_date <= ?'; params.push(date_to); }
|
||||
if (company_id) { sql += ' AND dv.company_id = ?'; params.push(company_id); }
|
||||
if (purpose) { sql += ' AND dv.purpose = ?'; params.push(purpose); }
|
||||
sql += ' ORDER BY dv.visit_date DESC, dv.check_in_time DESC';
|
||||
const [rows] = await db.query(sql, params);
|
||||
return rows;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
findToday, getTodayStats, findAll, findById, create, update,
|
||||
checkout, bulkCheckout, autoCheckoutAll, deleteVisit, getStats, exportCsv
|
||||
};
|
||||
141
tkpurchase/api/models/partnerModel.js
Normal file
141
tkpurchase/api/models/partnerModel.js
Normal file
@@ -0,0 +1,141 @@
|
||||
const mysql = require('mysql2/promise');
|
||||
|
||||
let pool;
|
||||
function getPool() {
|
||||
if (!pool) {
|
||||
pool = mysql.createPool({
|
||||
host: process.env.DB_HOST || 'mariadb',
|
||||
port: parseInt(process.env.DB_PORT) || 3306,
|
||||
user: process.env.DB_USER || 'hyungi_user',
|
||||
password: process.env.DB_PASSWORD,
|
||||
database: process.env.DB_NAME || 'hyungi',
|
||||
waitForConnections: true,
|
||||
connectionLimit: 10,
|
||||
queueLimit: 0
|
||||
});
|
||||
}
|
||||
return pool;
|
||||
}
|
||||
|
||||
// ===== 협력업체 =====
|
||||
|
||||
async function findAll({ search, is_active } = {}) {
|
||||
const db = getPool();
|
||||
let sql = 'SELECT * FROM partner_companies WHERE 1=1';
|
||||
const params = [];
|
||||
if (is_active !== undefined) { sql += ' AND is_active = ?'; params.push(is_active); }
|
||||
if (search) { sql += ' AND (company_name LIKE ? OR business_number LIKE ?)'; params.push(`%${search}%`, `%${search}%`); }
|
||||
sql += ' ORDER BY company_name';
|
||||
const [rows] = await db.query(sql, params);
|
||||
return rows;
|
||||
}
|
||||
|
||||
async function findById(id) {
|
||||
const db = getPool();
|
||||
const [rows] = await db.query('SELECT * FROM partner_companies WHERE id = ?', [id]);
|
||||
return rows[0] || null;
|
||||
}
|
||||
|
||||
async function search(q) {
|
||||
const db = getPool();
|
||||
const [rows] = await db.query(
|
||||
'SELECT id, company_name, business_number FROM partner_companies WHERE is_active = TRUE AND company_name LIKE ? ORDER BY company_name LIMIT 20',
|
||||
[`%${q}%`]
|
||||
);
|
||||
return rows;
|
||||
}
|
||||
|
||||
async function create(data) {
|
||||
const db = getPool();
|
||||
const [result] = await db.query(
|
||||
`INSERT INTO partner_companies (company_name, business_number, representative, contact_name, contact_phone, address, business_type, insurance_number, insurance_expiry, notes)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||
[data.company_name, data.business_number || null, data.representative || null,
|
||||
data.contact_name || null, data.contact_phone || null, data.address || null,
|
||||
data.business_type ? JSON.stringify(data.business_type) : null,
|
||||
data.insurance_number || null, data.insurance_expiry || null, data.notes || null]
|
||||
);
|
||||
return findById(result.insertId);
|
||||
}
|
||||
|
||||
async function update(id, data) {
|
||||
const db = getPool();
|
||||
const fields = [];
|
||||
const values = [];
|
||||
if (data.company_name !== undefined) { fields.push('company_name = ?'); values.push(data.company_name); }
|
||||
if (data.business_number !== undefined) { fields.push('business_number = ?'); values.push(data.business_number || null); }
|
||||
if (data.representative !== undefined) { fields.push('representative = ?'); values.push(data.representative || null); }
|
||||
if (data.contact_name !== undefined) { fields.push('contact_name = ?'); values.push(data.contact_name || null); }
|
||||
if (data.contact_phone !== undefined) { fields.push('contact_phone = ?'); values.push(data.contact_phone || null); }
|
||||
if (data.address !== undefined) { fields.push('address = ?'); values.push(data.address || null); }
|
||||
if (data.business_type !== undefined) { fields.push('business_type = ?'); values.push(data.business_type ? JSON.stringify(data.business_type) : null); }
|
||||
if (data.insurance_number !== undefined) { fields.push('insurance_number = ?'); values.push(data.insurance_number || null); }
|
||||
if (data.insurance_expiry !== undefined) { fields.push('insurance_expiry = ?'); values.push(data.insurance_expiry || null); }
|
||||
if (data.notes !== undefined) { fields.push('notes = ?'); values.push(data.notes || null); }
|
||||
if (data.is_active !== undefined) { fields.push('is_active = ?'); values.push(data.is_active); }
|
||||
if (fields.length === 0) return findById(id);
|
||||
values.push(id);
|
||||
await db.query(`UPDATE partner_companies SET ${fields.join(', ')} WHERE id = ?`, values);
|
||||
return findById(id);
|
||||
}
|
||||
|
||||
async function deactivate(id) {
|
||||
const db = getPool();
|
||||
await db.query('UPDATE partner_companies SET is_active = FALSE WHERE id = ?', [id]);
|
||||
}
|
||||
|
||||
// ===== 작업자 =====
|
||||
|
||||
async function findWorkersByCompany(companyId) {
|
||||
const db = getPool();
|
||||
const [rows] = await db.query(
|
||||
'SELECT * FROM partner_workers WHERE company_id = ? ORDER BY is_team_leader DESC, worker_name',
|
||||
[companyId]
|
||||
);
|
||||
return rows;
|
||||
}
|
||||
|
||||
async function findWorkerById(id) {
|
||||
const db = getPool();
|
||||
const [rows] = await db.query('SELECT * FROM partner_workers WHERE id = ?', [id]);
|
||||
return rows[0] || null;
|
||||
}
|
||||
|
||||
async function createWorker(companyId, data) {
|
||||
const db = getPool();
|
||||
const [result] = await db.query(
|
||||
`INSERT INTO partner_workers (company_id, worker_name, position, is_team_leader, phone, safety_training_date, notes)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?)`,
|
||||
[companyId, data.worker_name, data.position || null,
|
||||
data.is_team_leader || false, data.phone || null,
|
||||
data.safety_training_date || null, data.notes || null]
|
||||
);
|
||||
return findWorkerById(result.insertId);
|
||||
}
|
||||
|
||||
async function updateWorker(id, data) {
|
||||
const db = getPool();
|
||||
const fields = [];
|
||||
const values = [];
|
||||
if (data.worker_name !== undefined) { fields.push('worker_name = ?'); values.push(data.worker_name); }
|
||||
if (data.position !== undefined) { fields.push('position = ?'); values.push(data.position || null); }
|
||||
if (data.is_team_leader !== undefined) { fields.push('is_team_leader = ?'); values.push(data.is_team_leader); }
|
||||
if (data.phone !== undefined) { fields.push('phone = ?'); values.push(data.phone || null); }
|
||||
if (data.safety_training_date !== undefined) { fields.push('safety_training_date = ?'); values.push(data.safety_training_date || null); }
|
||||
if (data.notes !== undefined) { fields.push('notes = ?'); values.push(data.notes || null); }
|
||||
if (data.is_active !== undefined) { fields.push('is_active = ?'); values.push(data.is_active); }
|
||||
if (fields.length === 0) return findWorkerById(id);
|
||||
values.push(id);
|
||||
await db.query(`UPDATE partner_workers SET ${fields.join(', ')} WHERE id = ?`, values);
|
||||
return findWorkerById(id);
|
||||
}
|
||||
|
||||
async function deactivateWorker(id) {
|
||||
const db = getPool();
|
||||
await db.query('UPDATE partner_workers SET is_active = FALSE WHERE id = ?', [id]);
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getPool, findAll, findById, search, create, update, deactivate,
|
||||
findWorkersByCompany, findWorkerById, createWorker, updateWorker, deactivateWorker
|
||||
};
|
||||
Reference in New Issue
Block a user