@hecom/codearts 0.2.3 → 0.3.1

package/dist/commands/daily.command.js

@@ -4,47 +4,91 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dailyCommand = dailyCommand;
+const ora_1 = __importDefault(require("ora"));
 const picocolors_1 = __importDefault(require("picocolors"));
+const holidays_1 = require("../config/holidays");
 const business_service_1 = require("../services/business.service");
 const config_loader_1 = require("../utils/config-loader");
+const console_1 = require("../utils/console");
 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');
+    return (workHour.issueType === '缺陷' || workHour.issueType === '3' || workHour.issueType === 'Bug');
 }
 /**
- * 查询单个角色的日报数据
+ * 查询用户工时明细（不区分角色）
+ * @param businessService 业务服务实例
+ * @param projectId 项目ID
+ * @param roleIds 角色ID列表
+ * @param targetDate 目标日期
+ * @return 用户工时明细列表
  */
-async function queryDailyReportData(businessService, projectId, roleId, targetDate) {
-    const roleMembers = await businessService.getMembersByRoleId(projectId, roleId);
-    if (roleMembers.length === 0) {
-        return null;
-    }
-    const roleName = roleMembers[0].role_name;
-    const roleUserIds = roleMembers.map((member) => member.user_id);
-    const dailyStats = await businessService.getDailyWorkHourStats(projectId, roleUserIds, targetDate);
+async function queryDailyUserStats(businessService, projectId, roleIds, targetDate) {
+    const members = await businessService.getMembersByRoleIds(projectId, roleIds);
+    const userIds = members.map((member) => member.user_id);
+    const dailyStats = await businessService.getDailyWorkHourStats(projectId, userIds, targetDate);
+    const userStats = dailyStats.userStats.map((userStat) => ({
+        date: targetDate,
+        userId: userStat.userId,
+        userName: userStat.userName,
+        roleName: members.find((m) => m.user_id === userStat.userId)?.role_name,
+        totalHours: userStat.totalHours,
+        workHours: userStat.workHours.map((workHour) => ({
+            issueId: workHour.issue_id,
+            subject: workHour.subject,
+            summary: workHour.summary,
+            issueType: workHour.issue_type,
+            nickName: workHour.nick_name,
+            workHoursTypeName: workHour.work_hours_type_name,
+            workHoursNum: workHour.work_hours_num,
+        })),
+    }));
+    // 判断是否为工作日，非工作日应计工时为0
+    const isWorkDay = (0, holidays_1.isWorkday)(new Date(targetDate), targetDate.split('-')[0]);
+    const expectedHours = isWorkDay ? members.length * 8 : 0;
+    const totalMap = [
+        ['统计人数', `${members.length} 人`],
+        ['应计工时', `${expectedHours} 小时`],
+        ['实际工时', `${dailyStats.totalHours} 小时`],
+    ];
+    return {
+        list: userStats,
+        roleNames: Array.from(new Set(userStats.map((s) => s.roleName).filter((r) => r !== undefined))),
+        title: `${targetDate} 工时统计`,
+        totalMap,
+    };
+}
+/**
+ * 查询日报报告数据（包括Bug汇总、迭代进度、其他工作等）
+ * @param businessService 业务服务实例
+ * @param projectId 项目ID
+ * @param targetDate 目标日期
+ * @param userIds 用户ID列表
+ * @param userStats 用户工时统计数据
+ */
+async function queryDailyReport(businessService, projectId, targetDate, userStats) {
+    // Bug汇总
     const activeIssueIds = new Set();
-    dailyStats.userStats.forEach((userStat) => {
+    userStats.forEach((userStat) => {
         userStat.workHours.forEach((workHour) => {
-            activeIssueIds.add(workHour.issue_id);
+            activeIssueIds.add(workHour.issueId);
         });
     });
-    // Bug汇总
     const bugWorkHoursMap = new Map();
-    dailyStats.userStats.forEach((userStat) => {
+    userStats.forEach((userStat) => {
         userStat.workHours.forEach((workHour) => {
             if (isBug(workHour)) {
                 const key = workHour.subject;
-                const hours = parseFloat(workHour.work_hours_num) || 0;
+                const hours = parseFloat(workHour.workHoursNum) || 0;
                 if (bugWorkHoursMap.has(key)) {
                     const existing = bugWorkHoursMap.get(key);
-                    existing.users.add(workHour.nick_name);
+                    existing.users.add(userStat.userName);
                     existing.totalHours += hours;
                 }
                 else {
                     bugWorkHoursMap.set(key, {
                         title: workHour.subject,
-                        users: new Set([workHour.nick_name]),
+                        users: new Set([userStat.userName]),
                         totalHours: hours,
                     });
                 }
@@ -61,11 +105,11 @@ async function queryDailyReportData(businessService, projectId, roleId, targetDa
     };
     // 迭代进度
     const activeIterations = await businessService.getActiveIterationsOnDate(projectId, targetDate);
-    const iterationProgress = [];
+    let iterationProgress = [];
     let activeIssues = [];
     if (activeIterations.length > 0) {
         const activeIterationIds = activeIterations.map((iteration) => iteration.id);
-        const issues = await businessService.getWorkloadByIterationsAndUsers(projectId, activeIterationIds, roleUserIds);
+        const issues = await businessService.getWorkloadByIterationsAndUsers(projectId, activeIterationIds, userStats.map((s) => s.userId));
         activeIssues = issues.filter((issue) => activeIssueIds.has(issue.id));
         if (activeIssues.length > 0) {
             const activeIssuesByIteration = new Map();
@@ -131,42 +175,26 @@ async function queryDailyReportData(businessService, projectId, roleId, targetDa
         '【移动端】【鸿蒙】调研、问题修复、打包等零散工作': '【鸿蒙】',
     };
     const otherWork = [];
-    dailyStats.userStats.forEach((userStat) => {
+    userStats.forEach((userStat) => {
         userStat.workHours.forEach((workHour) => {
             if (workHour.summary &&
                 workHour.summary.trim() !== '' &&
                 !isBug(workHour) &&
-                !displayedIssueIds.has(workHour.issue_id)) {
+                !displayedIssueIds.has(workHour.issueId)) {
                 const subject = subjectMap[workHour.subject] ?? workHour.subject;
                 otherWork.push({
                     subject,
                     summary: workHour.summary,
-                    nickName: workHour.nick_name,
+                    nickName: userStat.userName,
                 });
             }
         });
     });
-    // 用户工时统计
-    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,
+        totalHours: userStats.reduce((sum, stat) => sum + stat.totalHours, 0),
     };
 }
 function issueTypeColor(type) {
@@ -179,76 +207,44 @@ function issueTypeColor(type) {
 /**
  * 控制台输出日报（多角色统一汇总）
  */
-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));
+function outputConsole(data) {
+    const list = data.list;
+    (0, console_1.consoleTotal)(data);
     // 平铺所有用户的工时明细
-    allReports.forEach((report) => {
-        report.userStats.forEach((userStat) => {
-            logger_1.logger.info();
-            logger_1.logger.info(picocolors_1.default.red(`${userStat.userName} ${userStat.totalHours}小时`));
-            userStat.workHours
-                .sort((a, b) => a.issueType.localeCompare(b.issueType))
-                .forEach((workHour) => {
-                const summaryPart = workHour.summary && workHour.summary.trim() !== ''
-                    ? picocolors_1.default.cyan(` ${workHour.summary}`)
-                    : '';
-                const workHoursTypePart = workHour.workHoursTypeName
-                    ? ` (${workHour.workHoursTypeName})`
-                    : '';
-                logger_1.logger.info(`  ${issueTypeColor(workHour.issueType)} ${workHour.subject}${summaryPart} ${workHoursTypePart} ${workHour.workHoursNum}小时`);
-            });
+    list.forEach((userStat) => {
+        logger_1.logger.info();
+        logger_1.logger.info(picocolors_1.default.red(`${userStat.userName} ${userStat.totalHours}小时`));
+        userStat.workHours
+            .sort((a, b) => a.issueType.localeCompare(b.issueType))
+            .forEach((workHour) => {
+            const summaryPart = workHour.summary && workHour.summary.trim() !== '' ? picocolors_1.default.cyan(` ${workHour.summary}`) : '';
+            const workHoursTypePart = workHour.workHoursTypeName
+                ? ` (${workHour.workHoursTypeName})`
+                : '';
+            logger_1.logger.info(`  ${issueTypeColor(workHour.issueType)} ${workHour.subject}${summaryPart} ${workHoursTypePart} ${workHour.workHoursNum}小时`);
         });
     });
-    if (!showReport) {
-        return;
-    }
-    // 总结报告（合并所有角色的数据）
-    consoleReport(allReports, total);
 }
-function consoleReport(allReports, total) {
+function consoleReport(report) {
     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,
-                });
-            }
-        });
+    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 (allBugs.size > 0) {
         logger_1.logger.info(`\n${index}.Bug跟进: ${allBugs.size}项`);
@@ -261,28 +257,26 @@ function consoleReport(allReports, total) {
     }
     // 合并所有迭代进度
     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],
-                });
-            }
-        });
+    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}%`);
@@ -292,31 +286,34 @@ function consoleReport(allReports, total) {
         });
     });
     // 合并所有其他工作
-    const allOtherWork = [];
-    allReports.forEach((report) => {
-        allOtherWork.push(...report.otherWork);
-    });
-    if (allOtherWork.length > 0) {
-        logger_1.logger.info(`${index}.其他: ${allOtherWork.length}项`);
-        allOtherWork.forEach((work) => {
+    if (report.otherWork.length > 0) {
+        logger_1.logger.info(`${index}.其他: ${report.otherWork.length}项`);
+        report.otherWork.forEach((work) => {
             const subjectPart = work.subject ? `${work.subject} ` : '';
             logger_1.logger.info(` - ${subjectPart}${work.summary} ${work.nickName}`);
         });
         index++;
     }
-    logger_1.logger.info(`${index}.工时: ${total.totalHours}`);
+    logger_1.logger.info(`${index}.工时: ${report.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 ?? ''}`);
-            });
+    csvLines.push((0, csv_writer_1.buildCsvRow)(['日期', '角色', '用户', '类型', '工作项', '工作内容', '工时类型', '工时']));
+    list.forEach((userStat) => {
+        userStat.workHours.forEach((workHour) => {
+            csvLines.push((0, csv_writer_1.buildCsvRow)([
+                userStat.date,
+                userStat.roleName,
+                userStat.userName,
+                workHour.issueType,
+                workHour.subject,
+                workHour.summary,
+                workHour.workHoursTypeName,
+                workHour.workHoursNum,
+            ]));
         });
     });
     const filename = `daily-${targetDate}.csv`;
@@ -332,31 +329,30 @@ function outputJson(data) {
  * daily 命令入口
  */
 async function dailyCommand(date, cliOptions = {}) {
-    try {
-        const targetDate = date || new Date().toISOString().split('T')[0];
-        const showReport = cliOptions.report ?? false;
-        const { projectId, roleIds, config, outputFormat } = (0, config_loader_1.loadConfig)(cliOptions);
-        const businessService = new business_service_1.BusinessService(config);
-        const allReports = [];
-        for (const roleId of roleIds) {
-            const reportData = await queryDailyReportData(businessService, projectId, roleId, targetDate);
-            if (reportData) {
-                allReports.push(reportData);
-            }
-        }
-        // 控制台输出
-        if (outputFormat === 'console') {
-            outputConsole(allReports, showReport);
-        }
-        else if (outputFormat === 'csv') {
-            outputCsv(allReports, targetDate);
-        }
-        else if (outputFormat === 'json') {
-            outputJson(allReports);
+    const spinner = (0, ora_1.default)('正在查询数据...').start();
+    const targetDate = date || new Date().toISOString().split('T')[0];
+    const showReport = cliOptions.report ?? false;
+    const { projectId, roleIds, config, outputFormat } = (0, config_loader_1.loadConfig)(cliOptions);
+    const businessService = new business_service_1.BusinessService(config);
+    // 查询用户工时统计
+    const data = await queryDailyUserStats(businessService, projectId, roleIds, targetDate);
+    // 查询报告数据
+    let report = null;
+    if (showReport && outputFormat === 'console') {
+        report = await queryDailyReport(businessService, projectId, targetDate, data.list);
+    }
+    spinner.stop();
+    // 控制台输出
+    if (outputFormat === 'console') {
+        outputConsole(data);
+        if (report) {
+            consoleReport(report);
         }
     }
-    catch (error) {
-        logger_1.logger.error(`执行过程中发生错误:`, error);
-        process.exit(1);
+    else if (outputFormat === 'csv') {
+        outputCsv(data.list, targetDate);
+    }
+    else if (outputFormat === 'json') {
+        outputJson(data.list);
     }
 }