diff --git a/tkpurchase/api/controllers/scheduleController.js b/tkpurchase/api/controllers/scheduleController.js
index 7a75eda..b226a62 100644
--- a/tkpurchase/api/controllers/scheduleController.js
+++ b/tkpurchase/api/controllers/scheduleController.js
@@ -4,7 +4,7 @@ const scheduleModel = require('../models/scheduleModel');
async function list(req, res) {
try {
const { company, company_id, date_from, date_to, status, project_id, page, limit } = req.query;
- const rows = await scheduleModel.findAll({
+ const { rows, total } = await scheduleModel.findAll({
company: company || undefined,
company_id: company_id ? parseInt(company_id) : undefined,
date_from,
@@ -14,7 +14,7 @@ async function list(req, res) {
page: page ? parseInt(page) : 1,
limit: limit ? parseInt(limit) : 50
});
- res.json({ success: true, data: rows });
+ res.json({ success: true, data: rows, total });
} catch (err) {
console.error('Schedule list error:', err);
res.status(500).json({ success: false, error: err.message });
diff --git a/tkpurchase/api/index.js b/tkpurchase/api/index.js
index bb77b50..973036e 100644
--- a/tkpurchase/api/index.js
+++ b/tkpurchase/api/index.js
@@ -37,6 +37,12 @@ app.get('/health', (req, res) => {
res.json({ status: 'ok', service: 'tkpurchase-api', timestamp: new Date().toISOString() });
});
+// API 캐시 비활성화
+app.use('/api', (req, res, next) => {
+ res.set('Cache-Control', 'no-store');
+ next();
+});
+
// Routes
app.use('/api/partners', partnerRoutes);
app.use('/api/day-labor', dayLaborRoutes);
diff --git a/tkpurchase/api/models/scheduleModel.js b/tkpurchase/api/models/scheduleModel.js
index 9e360c5..0e64fc1 100644
--- a/tkpurchase/api/models/scheduleModel.js
+++ b/tkpurchase/api/models/scheduleModel.js
@@ -1,27 +1,35 @@
const { getPool } = require('./partnerModel');
+function buildWhereClause({ company, company_id, date_from, date_to, status, project_id }) {
+ let where = ' WHERE 1=1';
+ const params = [];
+ if (company) { where += ' AND pc.company_name LIKE ?'; params.push('%' + company + '%'); }
+ if (company_id) { where += ' AND ps.company_id = ?'; params.push(company_id); }
+ if (date_from) { where += ' AND ps.end_date >= ?'; params.push(date_from); }
+ if (date_to) { where += ' AND ps.start_date <= ?'; params.push(date_to); }
+ if (status) { where += ' AND ps.status = ?'; params.push(status); }
+ if (project_id) { where += ' AND ps.project_id = ?'; params.push(project_id); }
+ return { where, params };
+}
+
async function findAll({ company, company_id, date_from, date_to, status, project_id, page = 1, limit = 50 } = {}) {
const db = getPool();
- let sql = `SELECT ps.*, pc.company_name, su.name AS registered_by_name,
- p.project_name, p.job_no
- FROM partner_schedules ps
+ const { where, params } = buildWhereClause({ company, company_id, date_from, date_to, status, project_id });
+
+ const fromClause = ` FROM partner_schedules ps
LEFT JOIN partner_companies pc ON ps.company_id = pc.id
LEFT JOIN sso_users su ON ps.registered_by = su.user_id
- LEFT JOIN projects p ON ps.project_id = p.project_id
- WHERE 1=1`;
- const params = [];
- if (company) { sql += ' AND pc.company_name LIKE ?'; params.push('%' + company + '%'); }
- if (company_id) { sql += ' AND ps.company_id = ?'; params.push(company_id); }
- if (date_from) { sql += ' AND ps.end_date >= ?'; params.push(date_from); }
- if (date_to) { sql += ' AND ps.start_date <= ?'; params.push(date_to); }
- if (status) { sql += ' AND ps.status = ?'; params.push(status); }
- if (project_id) { sql += ' AND ps.project_id = ?'; params.push(project_id); }
+ LEFT JOIN projects p ON ps.project_id = p.project_id`;
+
+ const [countResult] = await db.query('SELECT COUNT(*) AS cnt' + fromClause + where, params);
+
+ let sql = `SELECT ps.*, pc.company_name, su.name AS registered_by_name,
+ p.project_name, p.job_no` + fromClause + where;
sql += ' ORDER BY ps.start_date DESC, ps.created_at DESC';
const offset = (page - 1) * limit;
sql += ' LIMIT ? OFFSET ?';
- params.push(limit, offset);
- const [rows] = await db.query(sql, params);
- return rows;
+ const [rows] = await db.query(sql, [...params, limit, offset]);
+ return { rows, total: countResult[0].cnt };
}
async function findById(id) {
diff --git a/tkpurchase/web/accounts.html b/tkpurchase/web/accounts.html
index 90a7e8d..9e630b3 100644
--- a/tkpurchase/web/accounts.html
+++ b/tkpurchase/web/accounts.html
@@ -6,7 +6,7 @@
계정 관리 - TK 구매관리
-
+
@@ -133,8 +133,8 @@
-
-
+
+