@dreamor/atlas-cli 0.7.16 → 0.7.17

package/dist/adapters/atlas/commands/actual/_logic.js

@@ -39,3 +39,43 @@ export function aggregateByAxis(rows, axis) {
 export function filterByStaff(entries, staffId) {
     return entries.filter((p) => p.staffId === staffId || p.staffName?.includes(staffId));
 }
+/**
+ * 走查 summaryByTeam 返回的树结构，提取指定项目的实际工时条目。
+ *
+ * 树中同一员工可能出现在 manager 层（汇总下属）和 leaf 层（个人），
+ * 采取走最深层的策略：越深的节点 detail 越精确。
+ */
+export function flattenTree(nodes, targetPid) {
+    const byStaffId = new Map();
+    function walk(items, depth) {
+        for (const raw of items ?? []) {
+            const node = raw;
+            const details = (node.detail ?? []);
+            let projectManpower = 0;
+            for (const d of details) {
+                if (String(d.projectId) === targetPid) {
+                    projectManpower += Number(d.manpower ?? 0);
+                }
+            }
+            if (projectManpower > 0) {
+                const sid = String(node.staffId ?? '');
+                const existing = byStaffId.get(sid);
+                if (!existing || depth > existing.depth) {
+                    byStaffId.set(sid, {
+                        depth,
+                        entry: {
+                            staffId: sid,
+                            staffName: String(node.realname ?? ''),
+                            manpower: Math.round(projectManpower * 100) / 100,
+                            departmentName: String(node.department ?? ''),
+                            role: String(node.role ?? ''),
+                        },
+                    });
+                }
+            }
+            walk(node.children, depth + 1);
+        }
+    }
+    walk(nodes, 0);
+    return [...byStaffId.values()].map((v) => v.entry);
+}

package/dist/adapters/atlas/commands/actual/index.js

@@ -4,15 +4,25 @@ import { enforceOutputLimit } from '../../util/output-limit.js';
 import { SessionExpiredError } from '../../util/errors.js';
 import { expandMonths, expandMonthsDefault } from '../../util/months.js';
 import { resolveSecureExportPath, secureWriteFile } from '../../util/secure-fs.js';
-import { annotateWithMonth, aggregateByAxis, filterByStaff, } from './_logic.js';
+import { annotateWithMonth, aggregateByAxis, filterByStaff, flattenTree, } from './_logic.js';
 import { resolveProjectId } from '../../util/env.js';
+import { readBanmaIdentity } from '../../auth/session.js';
 function getProjectId(opts) {
     return resolveProjectId(opts.projectId);
 }
 async function fetchActual(pid, month) {
     const client = createClient();
-    const data = await client.post('/yuntu-service/manpower/weekly/summaryByTeam.json', { projectId: pid, month });
-    return data ?? [];
+    const identity = await readBanmaIdentity();
+    const loginStaffId = identity?.staffId ?? '';
+    // B4: summaryByTeam 请求体需用 projectIds 数组 + 额外字段
+    // 使用 projectIds 时 detail 只返回该项目的数据
+    const raw = await client.post('/yuntu-service/manpower/weekly/summaryByTeam.json', { month, staffIds: [], projectIds: [pid], isConfirm: false, loginStaffId });
+    const tree = (Array.isArray(raw) ? raw : []);
+    // 根节点为当前用户，children 为团队成员
+    if (tree.length > 0 && tree[0].children) {
+        return flattenTree(tree[0].children, pid);
+    }
+    return [];
 }
 export async function showCmd(staffId, opts) {
     const pid = getProjectId(opts);

package/dist/adapters/atlas/commands/compare/index.js

@@ -5,6 +5,8 @@ import { expandMonths, expandMonthsDefault } from '../../util/months.js';
 import { monthTsToKey } from '../../util/time.js';
 import { groupByAxis, mergeBaselineActual, } from './_logic.js';
 import { resolveProjectId, resolveProjectInfo } from '../../util/env.js';
+import { readBanmaIdentity } from '../../auth/session.js';
+import { flattenTree as flattenActualTree } from '../actual/_logic.js';
 function getProjectId(opts) {
     return resolveProjectId(opts.projectId);
 }
@@ -38,9 +40,21 @@ export async function compareCmd(opts) {
         }
         // 指数退避：避免连续触发限流（B2）
         try {
-            const acData = await client.post('/yuntu-service/manpower/weekly/summaryByTeam.json', { projectId: pid, month: m });
-            for (const p of acData ?? []) {
-                allAc.push({ month: m, manpower: p.manpower ?? 0, role: p.role, departmentName: p.departmentName });
+            const identity = await readBanmaIdentity();
+            const loginStaffId = identity?.staffId ?? '';
+            const raw = await client.post('/yuntu-service/manpower/weekly/summaryByTeam.json', {
+                month: m, staffIds: [], projectIds: [pid], isConfirm: false, loginStaffId,
+            });
+            const tree = (Array.isArray(raw) ? raw : []);
+            const results = [];
+            if (tree.length > 0 && tree[0].children) {
+                const entries = flattenActualTree(tree[0].children, pid);
+                for (const p of entries) {
+                    results.push({ month: m, manpower: p.manpower ?? 0, role: p.role, departmentName: p.departmentName });
+                }
+            }
+            for (const ac of results) {
+                allAc.push(ac);
             }
         }
         catch (e) {

package/dist/adapters/atlas/util/version.js

@@ -1 +1 @@
-export const ATLAS_VERSION = '0.7.16';
+export const ATLAS_VERSION = '0.7.17';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamor/atlas-cli",
-  "version": "0.7.16",
+  "version": "0.7.17",
   "description": "Atlas CLI - 斑马云图人力基线管理工具",
   "type": "module",
   "bin": {