1ㅊㅏ완료

backend/api/report/summary/[id]/detail.get.ts

@@ -21,9 +21,9 @@ export default defineEventHandler(async (event) => {
     throw createError({ statusCode: 404, message: '취합 보고서를 찾을 수 없습니다.' })
   }
   
-  // 개별 보고서 목록 (새 구조: 마스터 + 프로젝트별 실적 조인)
+  // 개별 보고서 목록 (Task 기반)
   const reports = await query(`
-    SELECT 
+    SELECT DISTINCT
       r.report_id,
       r.author_id,
       e.employee_name as author_name, 
@@ -32,16 +32,49 @@ export default defineEventHandler(async (event) => {
       r.vacation_description,
       r.remark_description,
       r.report_status,
-      r.submitted_at,
-      rp.work_description,
-      rp.plan_description
+      r.submitted_at
     FROM wr_weekly_report r
-    JOIN wr_weekly_report_project rp ON r.report_id = rp.report_id
+    JOIN wr_weekly_report_task t ON r.report_id = t.report_id
     JOIN wr_employee_info e ON r.author_id = e.employee_id
-    WHERE rp.project_id = $1 AND r.report_year = $2 AND r.report_week = $3
+    WHERE t.project_id = $1 AND r.report_year = $2 AND r.report_week = $3
     ORDER BY e.employee_name
   `, [summary.project_id, summary.report_year, summary.report_week])
   
+  // 각 보고서의 Task 조회
+  const reportIds = reports.map((r: any) => r.report_id)
+  const tasks = reportIds.length > 0 ? await query(`
+    SELECT 
+      t.report_id,
+      t.task_type,
+      t.task_description,
+      t.task_hours,
+      t.is_completed
+    FROM wr_weekly_report_task t
+    WHERE t.report_id = ANY($1) AND t.project_id = $2
+    ORDER BY t.report_id, t.task_type
+  `, [reportIds, summary.project_id]) : []
+  
+  // Task를 보고서별로 그룹핑
+  const tasksByReport = new Map<number, { work: any[], plan: any[] }>()
+  for (const task of tasks) {
+    if (!tasksByReport.has(task.report_id)) {
+      tasksByReport.set(task.report_id, { work: [], plan: [] })
+    }
+    const group = tasksByReport.get(task.report_id)!
+    if (task.task_type === 'WORK') {
+      group.work.push({
+        description: task.task_description,
+        hours: parseFloat(task.task_hours) || 0,
+        isCompleted: task.is_completed
+      })
+    } else {
+      group.plan.push({
+        description: task.task_description,
+        hours: parseFloat(task.task_hours) || 0
+      })
+    }
+  }
+  
   return {
     summary: {
       summaryId: summary.summary_id,
@@ -53,24 +86,31 @@ export default defineEventHandler(async (event) => {
       weekStartDate: summary.week_start_date,
       weekEndDate: summary.week_end_date,
       memberCount: summary.member_count,
+      totalWorkHours: summary.total_work_hours,
       reviewerId: summary.reviewer_id,
       reviewerName: summary.reviewer_name,
       reviewerComment: summary.reviewer_comment,
       reviewedAt: summary.reviewed_at,
-      summaryStatus: summary.summary_status
+      summaryStatus: summary.summary_status,
+      aggregatedAt: summary.aggregated_at,
+      aiSummary: summary.ai_summary,
+      aiSummaryAt: summary.ai_summary_at
     },
-    reports: reports.map((r: any) => ({
-      reportId: r.report_id,
-      authorId: r.author_id,
-      authorName: r.author_name,
-      authorPosition: r.employee_position,
-      workDescription: r.work_description,
-      planDescription: r.plan_description,
-      issueDescription: r.issue_description,
-      vacationDescription: r.vacation_description,
-      remarkDescription: r.remark_description,
-      reportStatus: r.report_status,
-      submittedAt: r.submitted_at
-    }))
+    reports: reports.map((r: any) => {
+      const taskGroup = tasksByReport.get(r.report_id) || { work: [], plan: [] }
+      return {
+        reportId: r.report_id,
+        authorId: r.author_id,
+        authorName: r.author_name,
+        authorPosition: r.employee_position,
+        workTasks: taskGroup.work,
+        planTasks: taskGroup.plan,
+        issueDescription: r.issue_description,
+        vacationDescription: r.vacation_description,
+        remarkDescription: r.remark_description,
+        reportStatus: r.report_status,
+        submittedAt: r.submitted_at
+      }
+    })
   }
 })