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

fix: 작업일정 업체명 검색 필터 동작하도록 수정

Browse Source 
프론트엔드는 company(텍스트)를 보내지만 백엔드는 company_id(정수)만
읽고 있어 업체명 필터가 무시되던 버그 수정. findAll()에서
pc.company_name LIKE 검색 지원 추가.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Hyungi Ahn
2026-03-13 08:34:39 +09:00
parent b5b0fa1728
commit 3d6cedf667
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tkpurchase/api/controllers/scheduleController.js
View File

@@ -3,8 +3,9 @@ const scheduleModel = require('../models/scheduleModel');
// 일정 목록 // 일정 목록
async function list(req, res) { async function list(req, res) {
try { try {
const { company_id, date_from, date_to, status, project_id, page, limit } = req.query; const { company, company_id, date_from, date_to, status, project_id, page, limit } = req.query;
const rows = await scheduleModel.findAll({ const rows = await scheduleModel.findAll({
company: company || undefined,
company_id: company_id ? parseInt(company_id) : undefined, company_id: company_id ? parseInt(company_id) : undefined,
date_from, date_from,
date_to, date_to,

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

@@ -1,6 +1,6 @@
const { getPool } = require('./partnerModel'); const { getPool } = require('./partnerModel');
async function findAll({ company_id, date_from, date_to, status, project_id, page = 1, limit = 50 } = {}) { async function findAll({ company, company_id, date_from, date_to, status, project_id, page = 1, limit = 50 } = {}) {
const db = getPool(); const db = getPool();
let sql = `SELECT ps.*, pc.company_name, su.name AS registered_by_name, let sql = `SELECT ps.*, pc.company_name, su.name AS registered_by_name,
p.project_name, p.job_no p.project_name, p.job_no
@@ -10,6 +10,7 @@ async function findAll({ company_id, date_from, date_to, status, project_id, pag
LEFT JOIN projects p ON ps.project_id = p.project_id LEFT JOIN projects p ON ps.project_id = p.project_id
WHERE 1=1`; WHERE 1=1`;
const params = []; 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 (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_from) { sql += ' AND ps.end_date >= ?'; params.push(date_from); }
if (date_to) { sql += ' AND ps.start_date <= ?'; params.push(date_to); } if (date_to) { sql += ' AND ps.start_date <= ?'; params.push(date_to); }