feat: 작업 분석 시스템 및 관리 기능 대폭 개선

 새로운 기능:
- 작업 분석 페이지 구현 (기간별, 프로젝트별, 작업자별, 오류별)
- 개별 분석 실행 버튼으로 API 부하 최적화
- 연차/휴무 집계 방식 개선 (주말 제외, 작업내용 통합)
- 프로젝트 관리 시스템 (활성화/비활성화)
- 작업자 관리 시스템 (CRUD 기능)
- 코드 관리 시스템 (작업유형, 작업상태, 오류유형)

🎨 UI/UX 개선:
- 기간별 작업 현황을 테이블 형태로 변경
- 작업자별 rowspan 그룹화로 가독성 향상
- 연차/휴무 프로젝트 하단 배치 및 시각적 구분
- 기간 확정 시스템으로 사용자 경험 개선
- 반응형 디자인 적용

🔧 기술적 개선:
- Rate Limiting 제거 (내부 시스템 최적화)
- 주말 연차/휴무 자동 제외 로직
- 작업공수 계산 정확도 향상
- 데이터베이스 마이그레이션 추가
- API 엔드포인트 확장 및 최적화

🐛 버그 수정:
- projectSelect 요소 참조 오류 해결
- 차트 높이 무한 증가 문제 해결
- 날짜 표시 형식 단순화
- 작업보고서 저장 validation 오류 수정
This commit is contained in:
Hyungi Ahn
2025-11-04 16:56:47 +09:00
parent 746e09420b
commit de427c457b
46 changed files with 10912 additions and 530 deletions

View File

@@ -119,7 +119,7 @@ class WorkAnalysis {
SUM(CASE WHEN dwr.work_status_id = 2 THEN 1 ELSE 0 END) as errorCount,
COUNT(DISTINCT dwr.report_date) as activeDays
FROM daily_work_reports dwr
LEFT JOIN Projects p ON dwr.project_id = p.project_id
LEFT JOIN projects p ON dwr.project_id = p.project_id
WHERE dwr.report_date BETWEEN ? AND ?
GROUP BY dwr.project_id, p.project_name
ORDER BY totalHours DESC
@@ -364,7 +364,7 @@ class WorkAnalysis {
FROM daily_work_reports dwr
LEFT JOIN workers w ON dwr.worker_id = w.worker_id
LEFT JOIN work_types wt ON dwr.work_type_id = wt.id
LEFT JOIN Projects p ON dwr.project_id = p.project_id
LEFT JOIN projects p ON dwr.project_id = p.project_id
WHERE dwr.report_date BETWEEN ? AND ?
GROUP BY dwr.worker_id, w.worker_name, dwr.work_type_id, wt.name, dwr.project_id, p.project_name
HAVING totalHours > 0

View File

@@ -899,8 +899,8 @@ const getReportsWithOptions = async (options) => {
const updateReportById = async (reportId, updateData) => {
const db = await getDb();
// 허용된 필드 목록 (보안 및 안정성)
const allowedFields = ['project_id', 'task_id', 'work_hours', 'is_error', 'error_type_code_id'];
// 허용된 필드 목록 (보안 및 안정성) - 실제 테이블 컬럼명 사용
const allowedFields = ['project_id', 'work_type_id', 'work_hours', 'work_status_id', 'error_type_id'];
const setClauses = [];
const queryParams = [];
@@ -923,7 +923,7 @@ const updateReportById = async (reportId, updateData) => {
queryParams.push(reportId);
const sql = `UPDATE daily_work_reports SET ${setClauses.join(', ')} WHERE report_id = ?`;
const sql = `UPDATE daily_work_reports SET ${setClauses.join(', ')} WHERE id = ?`;
try {
const [result] = await db.query(sql, queryParams);
@@ -948,10 +948,10 @@ const removeReportById = async (reportId, deletedByUserId) => {
await conn.beginTransaction();
// 감사 로그를 위해 삭제 전 정보 조회
const [reportInfo] = await conn.query('SELECT * FROM daily_work_reports WHERE report_id = ?', [reportId]);
const [reportInfo] = await conn.query('SELECT * FROM daily_work_reports WHERE id = ?', [reportId]);
// 실제 삭제 작업
const [result] = await conn.query('DELETE FROM daily_work_reports WHERE report_id = ?', [reportId]);
const [result] = await conn.query('DELETE FROM daily_work_reports WHERE id = ?', [reportId]);
// 감사 로그 (삭제된 테이블이므로 콘솔 로그로 대체)
if (reportInfo.length > 0 && deletedByUserId) {
@@ -970,6 +970,158 @@ const removeReportById = async (reportId, deletedByUserId) => {
}
};
// ========== 마스터 데이터 CRUD 메서드들 ==========
/**
* 📝 작업 유형 생성
*/
const createWorkType = async (data, callback) => {
try {
const db = await getDb();
const { name, description, category } = data;
const [result] = await db.query(
'INSERT INTO work_types (name, description, category) VALUES (?, ?, ?)',
[name, description, category]
);
callback(null, { id: result.insertId, ...data });
} catch (err) {
console.error('작업 유형 생성 오류:', err);
callback(err);
}
};
/**
* ✏️ 작업 유형 수정
*/
const updateWorkType = async (id, data, callback) => {
try {
const db = await getDb();
const { name, description, category } = data;
const [result] = await db.query(
'UPDATE work_types SET name = ?, description = ?, category = ? WHERE id = ?',
[name, description, category, id]
);
callback(null, result);
} catch (err) {
console.error('작업 유형 수정 오류:', err);
callback(err);
}
};
/**
* 🗑️ 작업 유형 삭제
*/
const deleteWorkType = async (id, callback) => {
try {
const db = await getDb();
const [result] = await db.query('DELETE FROM work_types WHERE id = ?', [id]);
callback(null, result);
} catch (err) {
console.error('작업 유형 삭제 오류:', err);
callback(err);
}
};
/**
* 📝 작업 상태 생성
*/
const createWorkStatus = async (data, callback) => {
try {
const db = await getDb();
const { name, description, is_error } = data;
const [result] = await db.query(
'INSERT INTO work_status_types (name, description, is_error) VALUES (?, ?, ?)',
[name, description, is_error || 0]
);
callback(null, { id: result.insertId, ...data });
} catch (err) {
console.error('작업 상태 생성 오류:', err);
callback(err);
}
};
/**
* ✏️ 작업 상태 수정
*/
const updateWorkStatus = async (id, data, callback) => {
try {
const db = await getDb();
const { name, description, is_error } = data;
const [result] = await db.query(
'UPDATE work_status_types SET name = ?, description = ?, is_error = ? WHERE id = ?',
[name, description, is_error || 0, id]
);
callback(null, result);
} catch (err) {
console.error('작업 상태 수정 오류:', err);
callback(err);
}
};
/**
* 🗑️ 작업 상태 삭제
*/
const deleteWorkStatus = async (id, callback) => {
try {
const db = await getDb();
const [result] = await db.query('DELETE FROM work_status_types WHERE id = ?', [id]);
callback(null, result);
} catch (err) {
console.error('작업 상태 삭제 오류:', err);
callback(err);
}
};
/**
* 📝 오류 유형 생성
*/
const createErrorType = async (data, callback) => {
try {
const db = await getDb();
const { name, description, severity } = data;
const [result] = await db.query(
'INSERT INTO error_types (name, description, severity) VALUES (?, ?, ?)',
[name, description, severity || 'medium']
);
callback(null, { id: result.insertId, ...data });
} catch (err) {
console.error('오류 유형 생성 오류:', err);
callback(err);
}
};
/**
* ✏️ 오류 유형 수정
*/
const updateErrorType = async (id, data, callback) => {
try {
const db = await getDb();
const { name, description, severity } = data;
const [result] = await db.query(
'UPDATE error_types SET name = ?, description = ?, severity = ? WHERE id = ?',
[name, description, severity || 'medium', id]
);
callback(null, result);
} catch (err) {
console.error('오류 유형 수정 오류:', err);
callback(err);
}
};
/**
* 🗑️ 오류 유형 삭제
*/
const deleteErrorType = async (id, callback) => {
try {
const db = await getDb();
const [result] = await db.query('DELETE FROM error_types WHERE id = ?', [id]);
callback(null, result);
} catch (err) {
console.error('오류 유형 삭제 오류:', err);
callback(err);
}
};
// 모든 함수 내보내기 (Promise 기반 함수 위주로 재구성)
module.exports = {
@@ -989,6 +1141,17 @@ module.exports = {
getAllWorkTypes,
getAllWorkStatusTypes,
getAllErrorTypes,
// 마스터 데이터 CRUD
createWorkType,
updateWorkType,
deleteWorkType,
createWorkStatus,
updateWorkStatus,
deleteWorkStatus,
createErrorType,
updateErrorType,
deleteErrorType,
createDailyReport,
getMyAccumulatedHours,
getAccumulatedReportsByDate,

View File

@@ -6,14 +6,17 @@ const create = async (project, callback) => {
const {
job_no, project_name,
contract_date, due_date,
delivery_method, site, pm
delivery_method, site, pm,
is_active = true,
project_status = 'active',
completed_date = null
} = project;
const [result] = await db.query(
`INSERT INTO projects
(job_no, project_name, contract_date, due_date, delivery_method, site, pm)
VALUES (?, ?, ?, ?, ?, ?, ?)`,
[job_no, project_name, contract_date, due_date, delivery_method, site, pm]
(job_no, project_name, contract_date, due_date, delivery_method, site, pm, is_active, project_status, completed_date)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
[job_no, project_name, contract_date, due_date, delivery_method, site, pm, is_active, project_status, completed_date]
);
callback(null, result.insertId);
@@ -34,6 +37,21 @@ const getAll = async (callback) => {
}
};
// 활성 프로젝트만 조회 (작업보고서용)
const getActiveProjects = async (callback) => {
try {
const db = await getDb();
const [rows] = await db.query(
`SELECT * FROM projects
WHERE is_active = TRUE
ORDER BY project_name ASC`
);
callback(null, rows);
} catch (err) {
callback(err);
}
};
const getById = async (project_id, callback) => {
try {
const db = await getDb();
@@ -53,7 +71,8 @@ const update = async (project, callback) => {
const {
project_id, job_no, project_name,
contract_date, due_date,
delivery_method, site, pm
delivery_method, site, pm,
is_active, project_status, completed_date
} = project;
const [result] = await db.query(
@@ -64,9 +83,12 @@ const update = async (project, callback) => {
due_date = ?,
delivery_method= ?,
site = ?,
pm = ?
pm = ?,
is_active = ?,
project_status = ?,
completed_date = ?
WHERE project_id = ?`,
[job_no, project_name, contract_date, due_date, delivery_method, site, pm, project_id]
[job_no, project_name, contract_date, due_date, delivery_method, site, pm, is_active, project_status, completed_date, project_id]
);
callback(null, result.affectedRows);
@@ -91,6 +113,7 @@ const remove = async (project_id, callback) => {
module.exports = {
create,
getAll,
getActiveProjects,
getById,
update,
remove

View File

@@ -1,90 +0,0 @@
const { getDb } = require('../dbPool');
// 1. 생성
const create = async (task, callback) => {
try {
const db = await getDb();
const { category, subcategory, task_name, description } = task;
const [result] = await db.query(
`INSERT INTO tasks (category, subcategory, task_name, description)
VALUES (?, ?, ?, ?)`,
[category, subcategory, task_name, description]
);
callback(null, result.insertId);
} catch (err) {
callback(err);
}
};
// 2. 전체 조회
const getAll = async (callback) => {
try {
const db = await getDb();
const [rows] = await db.query(
`SELECT * FROM tasks ORDER BY task_id DESC`
);
callback(null, rows);
} catch (err) {
callback(err);
}
};
// 3. 단일 조회
const getById = async (task_id, callback) => {
try {
const db = await getDb();
const [rows] = await db.query(
`SELECT * FROM tasks WHERE task_id = ?`,
[task_id]
);
callback(null, rows[0]);
} catch (err) {
callback(err);
}
};
// 4. 수정
const update = async (task, callback) => {
try {
const db = await getDb();
const { task_id, category, subcategory, task_name, description } = task;
const [result] = await db.query(
`UPDATE tasks
SET category = ?,
subcategory = ?,
task_name = ?,
description = ?
WHERE task_id = ?`,
[category, subcategory, task_name, description, task_id]
);
callback(null, result.affectedRows);
} catch (err) {
callback(new Error(err.message || String(err)));
}
};
// 5. 삭제
const remove = async (task_id, callback) => {
try {
const db = await getDb();
const [result] = await db.query(
`DELETE FROM tasks WHERE task_id = ?`,
[task_id]
);
callback(null, result.affectedRows);
} catch (err) {
callback(err);
}
};
module.exports = {
create,
getAll,
getById,
update,
remove
};

View File

@@ -4,13 +4,22 @@ const { getDb } = require('../dbPool');
const create = async (worker, callback) => {
try {
const db = await getDb();
const { worker_name, join_date, job_type, salary, annual_leave, status } = worker;
const {
worker_name,
job_type = 'worker',
phone_number = null,
email = null,
hire_date = null,
department = null,
notes = null,
status = 'active'
} = worker;
const [result] = await db.query(
`INSERT INTO workers
(worker_name, join_date, job_type, salary, annual_leave, status)
VALUES (?, ?, ?, ?, ?, ?)`,
[worker_name, join_date, job_type, salary, annual_leave, status]
(worker_name, job_type, phone_number, email, hire_date, department, notes, status)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
[worker_name, job_type, phone_number, email, hire_date, department, notes, status]
);
callback(null, result.insertId);
@@ -65,17 +74,56 @@ const update = async (worker, callback) => {
}
};
// 5. 삭제
// 5. 삭제 (외래키 제약조건 처리)
const remove = async (worker_id, callback) => {
const db = await getDb();
const conn = await db.getConnection();
try {
const db = await getDb();
const [result] = await db.query(
await conn.beginTransaction();
console.log(`🗑️ 작업자 삭제 시작: worker_id=${worker_id}`);
// 안전한 삭제: 각 테이블을 개별적으로 처리하고 오류가 발생해도 계속 진행
const tables = [
{ name: 'users', query: 'UPDATE users SET worker_id = NULL WHERE worker_id = ?', action: '업데이트' },
{ name: 'Users', query: 'UPDATE Users SET worker_id = NULL WHERE worker_id = ?', action: '업데이트' },
{ name: 'daily_issue_reports', query: 'DELETE FROM daily_issue_reports WHERE worker_id = ?', action: '삭제' },
{ name: 'DailyIssueReports', query: 'DELETE FROM DailyIssueReports WHERE worker_id = ?', action: '삭제' },
{ name: 'work_reports', query: 'DELETE FROM work_reports WHERE worker_id = ?', action: '삭제' },
{ name: 'WorkReports', query: 'DELETE FROM WorkReports WHERE worker_id = ?', action: '삭제' },
{ name: 'daily_work_reports', query: 'DELETE FROM daily_work_reports WHERE worker_id = ?', action: '삭제' },
{ name: 'monthly_worker_status', query: 'DELETE FROM monthly_worker_status WHERE worker_id = ?', action: '삭제' },
{ name: 'worker_groups', query: 'DELETE FROM worker_groups WHERE worker_id = ?', action: '삭제' }
];
for (const table of tables) {
try {
const [result] = await conn.query(table.query, [worker_id]);
if (result.affectedRows > 0) {
console.log(`${table.name} 테이블 ${table.action}: ${result.affectedRows}`);
}
} catch (tableError) {
console.log(`⚠️ ${table.name} 테이블 ${table.action} 실패 (무시): ${tableError.message}`);
}
}
// 마지막으로 작업자 삭제
const [result] = await conn.query(
`DELETE FROM workers WHERE worker_id = ?`,
[worker_id]
);
console.log(`✅ 작업자 삭제 완료: ${result.affectedRows}`);
await conn.commit();
callback(null, result.affectedRows);
} catch (err) {
callback(err);
await conn.rollback();
console.error(`❌ 작업자 삭제 오류 (worker_id: ${worker_id}):`, err);
callback(new Error(`작업자 삭제 중 오류가 발생했습니다: ${err.message}`));
} finally {
conn.release();
}
};