@hecom/codearts 0.2.0 → 0.2.2

package/dist/commands/daily.command.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDailyReport = generateDailyReport;
 exports.dailyCommand = dailyCommand;
 const business_service_1 = require("../services/business.service");
 const config_loader_1 = require("../utils/config-loader");
+const csv_writer_1 = require("../utils/csv-writer");
+const logger_1 = require("../utils/logger");
 function isBug(workHour) {
     return (workHour.issue_type === '缺陷' || workHour.issue_type === '3' || workHour.issue_type === 'Bug');
 }
 /**
- * 生成单个角色的日报
+ * 查询单个角色的日报数据
  */
-async function generateDailyReport(businessService, projectId, roleId, targetDate) {
+async function queryDailyReportData(businessService, projectId, roleId, targetDate) {
     const roleMembers = await businessService.getMembersByRoleId(projectId, roleId);
     if (roleMembers.length === 0) {
-        console.log(`角色ID ${roleId} 未找到用户，跳过工时查询`);
-        return;
+        return null;
     }
     const roleName = roleMembers[0].role_name;
     const roleUserIds = roleMembers.map((member) => member.user_id);
@@ -25,6 +25,7 @@ async function generateDailyReport(businessService, projectId, roleId, targetDat
             activeIssueIds.add(workHour.issue_id);
         });
     });
+    // Bug汇总
     const bugWorkHoursMap = new Map();
     dailyStats.userStats.forEach((userStat) => {
         userStat.workHours.forEach((workHour) => {
@@ -46,95 +47,86 @@ async function generateDailyReport(businessService, projectId, roleId, targetDat
             }
         });
     });
-    const bugWorkHours = Array.from(bugWorkHoursMap.values()).map((bug) => ({
-        title: bug.title,
-        nick_name: Array.from(bug.users).join('、'),
-        work_hours: bug.totalHours.toString(),
-    }));
-    console.log(`\n${dailyStats.date} 日报 [${roleName}]:`);
-    console.log('='.repeat(50));
-    dailyStats.userStats.forEach((userStat) => {
-        console.log(`\n\x1b[31m${userStat.userName} 工时: ${userStat.totalHours}小时\x1b[0m`);
-        userStat.workHours.forEach((workHour) => {
-            const summaryPart = workHour.summary && workHour.summary.trim() !== ''
-                ? ` \x1b[36m${workHour.summary}\x1b[0m`
-                : '';
-            const workHoursTypePart = workHour.work_hours_type_name
-                ? ` (${workHour.work_hours_type_name})`
-                : '';
-            console.log(` - ${workHour.subject}${summaryPart} (${workHour.issue_type})${workHoursTypePart} ${workHour.work_hours_num}小时`);
-        });
-    });
-    console.log('\n\n');
-    console.log(`总结报告 [${roleName}]:`);
-    console.log('='.repeat(50));
-    let index = 1;
-    if (bugWorkHours.length > 0) {
-        console.log(`\n${index}.Bug跟进: ${bugWorkHours.length}项`);
-        if (bugWorkHours.length < 6) {
-            bugWorkHours.forEach((bug) => {
-                console.log(` - ${bug.title} ${bug.nick_name}`);
+    const bugSummary = {
+        count: bugWorkHoursMap.size,
+        items: Array.from(bugWorkHoursMap.values()).map((bug) => ({
+            title: bug.title,
+            users: Array.from(bug.users).join('、'),
+            hours: bug.totalHours,
+        })),
+    };
+    // 迭代进度
+    const activeIterations = await businessService.getActiveIterationsOnDate(projectId, targetDate);
+    const iterationProgress = [];
+    let activeIssues = [];
+    if (activeIterations.length > 0) {
+        const activeIterationIds = activeIterations.map((iteration) => iteration.id);
+        const issues = await businessService.getWorkloadByIterationsAndUsers(projectId, activeIterationIds, roleUserIds);
+        activeIssues = issues.filter((issue) => activeIssueIds.has(issue.id));
+        if (activeIssues.length > 0) {
+            const activeIssuesByIteration = new Map();
+            activeIssues.forEach((issue) => {
+                const iterationId = issue.iteration.id;
+                if (!activeIssuesByIteration.has(iterationId)) {
+                    activeIssuesByIteration.set(iterationId, []);
+                }
+                activeIssuesByIteration.get(iterationId).push(issue);
+            });
+            const issuesByIteration = new Map();
+            issues.forEach((issue) => {
+                const iterationId = issue.iteration.id;
+                if (!issuesByIteration.has(iterationId)) {
+                    issuesByIteration.set(iterationId, []);
+                }
+                issuesByIteration.get(iterationId).push(issue);
+            });
+            activeIterations.forEach((iteration) => {
+                const iterationActiveIssues = activeIssuesByIteration.get(iteration.id) || [];
+                if (iterationActiveIssues.length === 0) {
+                    return;
+                }
+                const iterationIssues = issuesByIteration.get(iteration.id) || [];
+                let completionRate = 0;
+                if (iterationIssues.length > 0) {
+                    const iterationStats = businessService.calculateWorkProgress(iterationIssues);
+                    completionRate = iterationStats.overallCompletionRate;
+                }
+                const activeIssuesData = iterationActiveIssues.map((issue) => {
+                    const doneRate = issue.expected_work_hours
+                        ? issue.actual_work_hours / issue.expected_work_hours
+                        : 0;
+                    const displayDoneRate = issue.done_ratio
+                        ? issue.done_ratio
+                        : Math.round(Math.min(doneRate * 100, 100));
+                    return {
+                        name: issue.name,
+                        doneRatio: displayDoneRate,
+                        assignedUser: issue.assigned_user.nick_name,
+                    };
+                });
+                iterationProgress.push({
+                    iterationName: iteration.name,
+                    completionRate,
+                    activeIssues: activeIssuesData,
+                });
             });
         }
-        index++;
     }
-    const activeIterations = await businessService.getActiveIterationsOnDate(projectId, targetDate);
-    if (activeIterations.length === 0) {
-        console.log('没有找到正在进行中的迭代');
-        return;
-    }
-    const activeIterationIds = activeIterations.map((iteration) => iteration.id);
-    const issues = await businessService.getWorkloadByIterationsAndUsers(projectId, activeIterationIds, roleUserIds);
-    const activeIssues = issues.filter((issue) => activeIssueIds.has(issue.id));
-    if (activeIssues.length !== 0) {
-        const activeIssuesByIteration = new Map();
-        activeIssues.forEach((issue) => {
-            const iterationId = issue.iteration.id;
-            if (!activeIssuesByIteration.has(iterationId)) {
-                activeIssuesByIteration.set(iterationId, []);
-            }
-            activeIssuesByIteration.get(iterationId).push(issue);
-        });
-        const issuesByIteration = new Map();
-        issues.forEach((issue) => {
-            const iterationId = issue.iteration.id;
-            if (!issuesByIteration.has(iterationId)) {
-                issuesByIteration.set(iterationId, []);
-            }
-            issuesByIteration.get(iterationId).push(issue);
-        });
-        activeIterations.forEach((iteration) => {
-            const iterationActiveIssues = activeIssuesByIteration.get(iteration.id) || [];
-            if (iterationActiveIssues.length === 0) {
-                return;
-            }
-            const iterationIssues = issuesByIteration.get(iteration.id) || [];
-            if (iterationIssues.length > 0) {
-                const iterationStats = businessService.calculateWorkProgress(iterationIssues);
-                console.log(`${index}.${iteration.name} ${iterationStats.overallCompletionRate}%`);
-                index++;
+    // 其他工作
+    const displayedIssueIds = new Set();
+    iterationProgress.forEach((iteration) => {
+        iteration.activeIssues.forEach((issue) => {
+            const foundIssue = activeIssues?.find((i) => i.name === issue.name);
+            if (foundIssue) {
+                displayedIssueIds.add(foundIssue.id);
             }
-            iterationActiveIssues.forEach((issue) => {
-                const doneRate = issue.expected_work_hours
-                    ? issue.actual_work_hours / issue.expected_work_hours
-                    : 0;
-                const displayDoneRate = issue.done_ratio
-                    ? issue.done_ratio
-                    : Math.round(Math.min(doneRate * 100, 100));
-                console.log(` - ${issue.name} ${displayDoneRate}% ${issue.assigned_user.nick_name}`);
-            });
         });
-    }
-    const displayedIssueIds = new Set();
-    activeIssues.forEach((issue) => {
-        displayedIssueIds.add(issue.id);
     });
     const subjectMap = {
         '【移动端】会议、调研、环境处理等零散工作': '',
         '【移动端】【鸿蒙】调研、问题修复、打包等零散工作': '【鸿蒙】',
-        // 可在此添加更多映射
     };
-    const otherWorkHours = [];
+    const otherWork = [];
     dailyStats.userStats.forEach((userStat) => {
         userStat.workHours.forEach((workHour) => {
             if (workHour.summary &&
@@ -142,23 +134,187 @@ async function generateDailyReport(businessService, projectId, roleId, targetDat
                 !isBug(workHour) &&
                 !displayedIssueIds.has(workHour.issue_id)) {
                 const subject = subjectMap[workHour.subject] ?? workHour.subject;
-                otherWorkHours.push({
+                otherWork.push({
                     subject,
                     summary: workHour.summary,
-                    nick_name: workHour.nick_name,
+                    nickName: workHour.nick_name,
+                });
+            }
+        });
+    });
+    // 用户工时统计
+    const userStats = dailyStats.userStats.map((userStat) => ({
+        userName: userStat.userName,
+        totalHours: userStat.totalHours,
+        workHours: userStat.workHours.map((workHour) => ({
+            subject: workHour.subject,
+            summary: workHour.summary,
+            issueType: workHour.issue_type,
+            workHoursTypeName: workHour.work_hours_type_name,
+            workHoursNum: workHour.work_hours_num,
+        })),
+    }));
+    return {
+        date: targetDate,
+        roleName,
+        roleId,
+        userStats,
+        bugSummary,
+        iterationProgress,
+        otherWork,
+        totalHours: dailyStats.totalHours,
+    };
+}
+/**
+ * 控制台输出日报（多角色统一汇总）
+ */
+function outputConsole(allReports, showReport = false) {
+    if (allReports.length === 0) {
+        return;
+    }
+    const targetDate = allReports[0].date;
+    logger_1.logger.info(`\n${targetDate} 工时统计 [${allReports.map((r) => r.roleName).join(', ')}]`);
+    logger_1.logger.info('='.repeat(80));
+    // 按角色显示汇总工时和人数
+    const roleSummaries = [];
+    const total = { totalHours: 0, memberCount: 0, roleName: '总计' };
+    allReports.forEach((report) => {
+        roleSummaries.push({
+            roleName: report.roleName,
+            totalHours: report.totalHours,
+            memberCount: report.userStats.length,
+        });
+        total.totalHours += report.totalHours;
+        total.memberCount += report.userStats.length;
+    });
+    roleSummaries.push(total);
+    roleSummaries.forEach((summary) => {
+        logger_1.logger.info(`[${summary.roleName}] ${summary.totalHours}小时, 人数: ${summary.memberCount}人`);
+    });
+    logger_1.logger.info('='.repeat(80));
+    // 平铺所有用户的工时明细
+    allReports.forEach((report) => {
+        report.userStats.forEach((userStat) => {
+            logger_1.logger.info(`\n\x1b[31m${userStat.userName} ${userStat.totalHours}小时\x1b[0m`);
+            userStat.workHours
+                .sort((a, b) => a.issueType.localeCompare(b.issueType))
+                .forEach((workHour) => {
+                const summaryPart = workHour.summary && workHour.summary.trim() !== ''
+                    ? ` \x1b[36m${workHour.summary}\x1b[0m`
+                    : '';
+                const workHoursTypePart = workHour.workHoursTypeName
+                    ? ` (${workHour.workHoursTypeName})`
+                    : '';
+                logger_1.logger.info(`  [${workHour.issueType}]${workHour.subject}${summaryPart} ${workHoursTypePart} ${workHour.workHoursNum}小时`);
+            });
+        });
+    });
+    if (!showReport) {
+        return;
+    }
+    // 总结报告（合并所有角色的数据）
+    consoleReport(allReports, total);
+}
+function consoleReport(allReports, total) {
+    logger_1.logger.info('\n\n');
+    logger_1.logger.info(`总结报告:`);
+    logger_1.logger.info('='.repeat(80));
+    let index = 1;
+    // 合并所有 Bug
+    const allBugs = new Map();
+    allReports.forEach((report) => {
+        report.bugSummary.items.forEach((bug) => {
+            if (allBugs.has(bug.title)) {
+                const existing = allBugs.get(bug.title);
+                bug.users.split('、').forEach((user) => existing.users.add(user));
+                existing.hours += bug.hours;
+            }
+            else {
+                allBugs.set(bug.title, {
+                    title: bug.title,
+                    users: new Set(bug.users.split('、')),
+                    hours: bug.hours,
                 });
             }
         });
     });
-    if (otherWorkHours.length > 0) {
-        console.log(`${index}.其他: ${otherWorkHours.length}项`);
-        otherWorkHours.forEach((work) => {
+    if (allBugs.size > 0) {
+        logger_1.logger.info(`\n${index}.Bug跟进: ${allBugs.size}项`);
+        if (allBugs.size < 6) {
+            Array.from(allBugs.values()).forEach((bug) => {
+                logger_1.logger.info(` - ${bug.title} ${Array.from(bug.users).join('、')}`);
+            });
+        }
+        index++;
+    }
+    // 合并所有迭代进度
+    const allIterations = new Map();
+    allReports.forEach((report) => {
+        report.iterationProgress.forEach((iteration) => {
+            if (allIterations.has(iteration.iterationName)) {
+                const existing = allIterations.get(iteration.iterationName);
+                // 使用最高的完成率
+                existing.completionRate = Math.max(existing.completionRate, iteration.completionRate);
+                // 合并活跃问题（去重）
+                iteration.activeIssues.forEach((issue) => {
+                    const exists = existing.activeIssues.some((i) => i.name === issue.name);
+                    if (!exists) {
+                        existing.activeIssues.push(issue);
+                    }
+                });
+            }
+            else {
+                allIterations.set(iteration.iterationName, {
+                    iterationName: iteration.iterationName,
+                    completionRate: iteration.completionRate,
+                    activeIssues: [...iteration.activeIssues],
+                });
+            }
+        });
+    });
+    Array.from(allIterations.values()).forEach((iteration) => {
+        logger_1.logger.info(`${index}.${iteration.iterationName} ${iteration.completionRate}%`);
+        index++;
+        iteration.activeIssues.forEach((issue) => {
+            logger_1.logger.info(` - ${issue.name} ${issue.doneRatio}% ${issue.assignedUser}`);
+        });
+    });
+    // 合并所有其他工作
+    const allOtherWork = [];
+    allReports.forEach((report) => {
+        allOtherWork.push(...report.otherWork);
+    });
+    if (allOtherWork.length > 0) {
+        logger_1.logger.info(`${index}.其他: ${allOtherWork.length}项`);
+        allOtherWork.forEach((work) => {
             const subjectPart = work.subject ? `${work.subject} ` : '';
-            console.log(` - ${subjectPart}${work.summary} ${work.nick_name}`);
+            logger_1.logger.info(` - ${subjectPart}${work.summary} ${work.nickName}`);
         });
         index++;
     }
-    console.log(`${index}.工时: ${dailyStats.totalHours}`);
+    logger_1.logger.info(`${index}.工时: ${total.totalHours}`);
+}
+/**
+ * CSV 文件输出
+ */
+function outputCsv(list, targetDate) {
+    const csvLines = [];
+    csvLines.push('日期,角色,用户,工作项,摘要,类型,工时类型,工时');
+    list.forEach((data) => {
+        data.userStats.forEach((userStat) => {
+            userStat.workHours.forEach((workHour) => {
+                csvLines.push(`${data.date ?? ''},${data.roleName ?? ''},${userStat.userName ?? ''},"${(0, csv_writer_1.escapeCsv)(workHour.subject)}","${(0, csv_writer_1.escapeCsv)(workHour.summary)}",${workHour.issueType ?? ''},${workHour.workHoursTypeName ?? ''},${workHour.workHoursNum ?? ''}`);
+            });
+        });
+    });
+    const filename = `daily-${targetDate}.csv`;
+    (0, csv_writer_1.writeCsvFile)(filename, csvLines, logger_1.logger);
+}
+/**
+ * JSON 输出（直接打印到控制台，供编程调用）
+ */
+function outputJson(data) {
+    logger_1.logger.json(data);
 }
 /**
  * daily 命令入口
@@ -166,19 +322,29 @@ async function generateDailyReport(businessService, projectId, roleId, targetDat
 async function dailyCommand(date, cliOptions = {}) {
     try {
         const targetDate = date || new Date().toISOString().split('T')[0];
-        console.log(`开始统计 ${targetDate} 的日报...`);
-        const { projectId, roleIds, config } = (0, config_loader_1.loadConfig)(cliOptions);
+        const showReport = cliOptions.report ?? false;
+        const { projectId, roleIds, config, outputFormat } = (0, config_loader_1.loadConfig)(cliOptions);
         const businessService = new business_service_1.BusinessService(config);
-        for (let i = 0; i < roleIds.length; i++) {
-            const roleId = roleIds[i];
-            if (i > 0) {
-                console.log('\n\n' + '='.repeat(80) + '\n');
+        const allReports = [];
+        for (const roleId of roleIds) {
+            const reportData = await queryDailyReportData(businessService, projectId, roleId, targetDate);
+            if (reportData) {
+                allReports.push(reportData);
             }
-            await generateDailyReport(businessService, projectId, roleId, targetDate);
+        }
+        // 控制台输出
+        if (outputFormat === 'console') {
+            outputConsole(allReports, showReport);
+        }
+        else if (outputFormat === 'csv') {
+            outputCsv(allReports, targetDate);
+        }
+        else if (outputFormat === 'json') {
+            outputJson(allReports);
         }
     }
     catch (error) {
-        console.error('执行过程中发生错误:', error);
+        logger_1.logger.error(`执行过程中发生错误:`, error);
         process.exit(1);
     }
 }