fix(assets): emphasize daily flow details and sort newest first

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ln-bi",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ln-bi",
-      "version": "1.1.18",
+      "version": "1.1.19",
       "dependencies": {
         "@amap/amap-jsapi-loader": "^1.0.1",
         "@hono/node-server": "^1.13.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ln-bi",
   "private": true,
-  "version": "1.1.18",
+  "version": "1.1.19",
   "type": "module",
   "scripts": {
     "dev": "concurrently -n server,client -c blue,green \"npm run dev:server\" \"npm run dev:client\"",

src/modules/assets/analysis-export.test.ts

@@ -41,3 +41,13 @@ test('one Excel workbook contains statistics and all details in two named sheets
   const empty = await createAnalysisWorkbook([], []);
   assert.deepEqual(empty.SheetNames, ['统计表', '详情表']);
 });
+
+test('inventory export uses assigned operations managers and a dash when unset', () => {
+  const vehicles = ['张三、李四', null, '   '].map(opsManagers => ({
+    opsManagers, customerManager: '业务负责人', customerName: '客户', status: 'Inventory',
+  } as VehicleListItem));
+  const rows = vehicleExportRows(vehicles, true);
+  assert.deepEqual(rows.map(row => row.运维负责人), ['张三、李四', '-', '-']);
+  assert.ok(rows.every(row => !('业务负责人' in row) && !('客户' in row)));
+  assert.equal(vehicleExportRows(vehicles)[0].业务负责人, '业务负责人');
+});

src/modules/assets/analysis-export.ts

@@ -12,7 +12,7 @@ export function statisticsExportRows(labels: string[], groups: { values: string[
   }));
 }
 
-export function vehicleExportRows(vehicles: VehicleListItem[]): ExportRow[] {
+export function vehicleExportRows(vehicles: VehicleListItem[], inventory = false): ExportRow[] {
   const status: Record<string, string> = { Abnormal: '异动', Pending: '待交车', Inventory: '在库', Operating: '运营中' };
   const operation: Record<string, string> = { '1': '租赁', '2': '自营', '3': '可运营', '4': '待运营' };
   const hasPending = vehicles.some(v => v.pendingDelivery);
@@ -21,7 +21,7 @@ export function vehicleExportRows(vehicles: VehicleListItem[]): ExportRow[] {
     车牌: v.plateNumber, VIN: v.vin, 品牌: v.brandLabel, 车型: v.type, 型号: v.model,
     省份: v.province, 城市: v.city || v.location,
     状态: status[v.status] || v.status, 运营状态: operation[v.operationStatus || ''] || v.operationStatus,
-    客户: v.customerName, 签约公司: v.orgName, 部门: v.departmentName, 业务负责人: v.customerManager,
+    ...(inventory ? { 运维负责人: v.opsManagers?.trim() || '-' } : { 客户: v.customerName, 签约公司: v.orgName, 部门: v.departmentName, 业务负责人: v.customerManager }),
     所属公司: v.subjectOrg, 合同: v.contractNo,
     ...(hasPending ? { 待交车合同: v.pendingDelivery?.contractNo, 待交车客户: v.pendingDelivery?.customerName } : {}),
     ...(hasMovement ? {

src/modules/assets/components/FlowAnalysisModal.tsx

@@ -48,7 +48,8 @@ function groupRows(rows: FlowDetailItem[], dimensions: Dimension[]): FlowGroup[]
     group.rows.push(row);
     groups.set(key, group);
   }
-  return Array.from(groups.values()).sort((a, b) => b.rows.length - a.rows.length || a.key.localeCompare(b.key, 'zh-CN'));
+  const dateIndex = dimensions.indexOf('date');
+  return Array.from(groups.values()).sort((a, b) => (dateIndex >= 0 ? b.values[dateIndex].localeCompare(a.values[dateIndex]) : 0) || b.rows.length - a.rows.length || a.key.localeCompare(b.key, 'zh-CN'));
 }
 
 export function FlowAnalysisModal(props: FlowAnalysisModalProps) {
@@ -68,7 +69,8 @@ function FlowAnalysisContent({ selectedFlow, selectedFlowDetails, setSelectedFlo
   useDialogFocus(true, dialog, close);
 
   const rows = useMemo(() => selectedFlowDetails.filter(row => matchesType(row, selectedFlow.type)
-    && ('date' in selectedFlow ? row.date === selectedFlow.date : row.date >= selectedFlow.start && row.date <= selectedFlow.end)), [selectedFlowDetails, selectedFlow]);
+    && ('date' in selectedFlow ? row.date === selectedFlow.date : row.date >= selectedFlow.start && row.date <= selectedFlow.end))
+    .sort((a, b) => b.date.localeCompare(a.date) || (b.eventTime || '').localeCompare(a.eventTime || '')), [selectedFlowDetails, selectedFlow]);
   const filterOptions = useMemo(() => Object.fromEntries(DIMENSIONS.map(({ key }) => {
     const eligible = rows.filter(row => DIMENSIONS.every(({ key: other }) => other === key || !filters[other]?.length || filters[other]!.includes(dimensionValue(row, other))));
     const counts = new Map<string, number>();
@@ -79,7 +81,8 @@ function FlowAnalysisContent({ selectedFlow, selectedFlowDetails, setSelectedFlo
   const filteredRows = useMemo(() => rows.filter(row => DIMENSIONS.every(({ key }) => !filters[key]?.length || filters[key]!.includes(dimensionValue(row, key)))), [rows, filters]);
   const groups = useMemo(() => {
     const flat = groupRows(filteredRows, dimensions);
-    return mergeActive ? orderDimensionGroups(flat, dimensions.length, group => group.values, group => group.rows.length) : flat;
+    return mergeActive ? orderDimensionGroups(flat, dimensions.length, group => group.values, group => group.rows.length, dimensions.includes('date') ? 'label' : 'count-desc',
+      (a, b, index) => dimensions[index] === 'date' ? b.values[index].localeCompare(a.values[index]) : a.values[index].localeCompare(b.values[index], 'zh-CN')) : flat;
   }, [filteredRows, dimensions, mergeActive]);
   const detailGroup = useMemo(() => detailKey === null ? null : groups.find(group => group.key === detailKey), [groups, detailKey]);
   const detailRows = detailGroup?.rows ?? EMPTY_FLOW_ROWS;

src/modules/assets/components/analysis/AssetAnalysisModal.tsx

@@ -128,7 +128,7 @@ function AnalysisDialog({ selection, subject, close }: Props & { selection: Vehi
         extra: view === 'inventory' ? { 待交车: row.totals.pending, 异动: row.totals.abnormal } : undefined })),
       showDetails ? rows.length : analysis.total,
     );
-    await downloadAnalysisWorkbook(statistics, vehicleExportRows(rows), `${title}-${scopeLabel}${detailGroup ? `-${detailGroup.label}` : ''}`);
+    await downloadAnalysisWorkbook(statistics, vehicleExportRows(rows, view === 'inventory'), `${title}-${scopeLabel}${detailGroup ? `-${detailGroup.label}` : ''}`);
   };
   return <div className="asset-analysis-overlay">
     <div ref={dialog} role="dialog" aria-modal="true" aria-label={title} tabIndex={-1} className={`asset-analysis-dialog ${view === 'abnormal' ? 'analysis-amber' : ''}`}>
@@ -164,7 +164,7 @@ function AnalysisDialog({ selection, subject, close }: Props & { selection: Vehi
             <div className="analysis-table-tools"><h3>车辆明细 <small>{number(visibleVehicles.length)} 台</small></h3><AnalysisExportButton disabled={detailBusy || !!detailError || !visibleVehicles.length} onExport={exportWorkbook} /><label className="analysis-search"><Search size={15} /><input aria-label="搜索车辆明细" placeholder="搜索车牌、VIN、型号、城市" value={search} onChange={event => { setSearch(event.target.value); }} /></label></div>
             {detailBusy ? <div className="analysis-message" role="status"><Loader2 className="animate-spin" />正在加载车辆明细…</div> : detailError ? <div className="analysis-message" role="alert"><p>{detailError}</p><button className="analysis-button" onClick={() => setDetailRetry(detailRetry + 1)}>重新加载明细</button></div> : <>
               {vehicles.length !== detailGroup.count && <p className="analysis-definition">车辆状态可能已更新：统计快照 {detailGroup.count} 台，当前明细 {vehicles.length} 台。</p>}
-              {(view === 'abnormal' || detailGroup.values.inventoryState === 'abnormal' || (filterValues.inventoryState?.length === 1 && filterValues.inventoryState[0] === 'abnormal')) ? <AbnormalVehicleDetails vehicles={shownVehicles} /> : (view === 'pending' || detailGroup.values.inventoryState === 'pending' || (filterValues.inventoryState?.length === 1 && filterValues.inventoryState[0] === 'pending')) ? <PendingVehicleDetails vehicles={shownVehicles} /> : <VehicleRows vehicles={shownVehicles} />}
+              {(view === 'abnormal' || detailGroup.values.inventoryState === 'abnormal' || (filterValues.inventoryState?.length === 1 && filterValues.inventoryState[0] === 'abnormal')) ? <AbnormalVehicleDetails vehicles={shownVehicles} /> : (view === 'pending' || detailGroup.values.inventoryState === 'pending' || (filterValues.inventoryState?.length === 1 && filterValues.inventoryState[0] === 'pending')) ? <PendingVehicleDetails vehicles={shownVehicles} /> : <VehicleRows vehicles={shownVehicles} inventory={view === 'inventory'} />}
               <ProgressiveRowsStatus {...detailProgress} unit="台" />
             </>}
           </div>}
@@ -175,14 +175,14 @@ function AnalysisDialog({ selection, subject, close }: Props & { selection: Vehi
   </div>;
 }
 
-function VehicleRows({ vehicles }: { vehicles: VehicleListItem[] }) {
+function VehicleRows({ vehicles, inventory = false }: { vehicles: VehicleListItem[]; inventory?: boolean }) {
   if (!vehicles.length) return <div className="analysis-message">暂无匹配车辆</div>;
   const stateLabel = (vehicle: VehicleListItem) => {
     const operation = ({ '1': '租赁', '2': '自营', '3': '可运营', '4': '待运营' } as Record<string, string>)[vehicle.operationStatus || ''] || vehicle.operationStatus;
     const business = ({ Abnormal: '异动', Pending: '待交车', Inventory: '在库', Operating: '运营中' } as Record<string, string>)[vehicle.status] || vehicle.status;
     return [business, operation].filter(Boolean).join(' · ');
   };
-  return <div className="analysis-detail-table" tabIndex={0} role="region" aria-label="车辆明细表"><table><thead><tr>{['车牌 / VIN', '品牌 / 车型 / 型号', '省份 / 城市', '状态', '客户 / 签约公司', '部门 / 业务负责人', '所属公司'].map(label => <th key={label}>{label}</th>)}</tr></thead><tbody>{vehicles.map(vehicle => <tr key={vehicle.id}><td><Blur>{vehicle.plateNumber || vehicle.vin || '未提供'}</Blur></td><td>{vehicle.brandLabel || '—'} · {vehicle.type}<small>{vehicle.model}</small></td><td>{vehicle.province || '未标注'} / {vehicle.city || vehicle.location || '未标注'}</td><td>{stateLabel(vehicle)}</td><td><Blur>{vehicle.customerName || '—'}</Blur><small><Blur>{vehicle.orgName || '—'}</Blur></small></td><td><Blur>{vehicle.departmentName || '—'}</Blur><small><Blur>{vehicle.customerManager || '—'}</Blur></small></td><td>{vehicle.subjectOrg || '—'}</td></tr>)}</tbody></table></div>;
+  return <div className="analysis-detail-table" tabIndex={0} role="region" aria-label="车辆明细表"><table><thead><tr>{['车牌 / VIN', '品牌 / 车型 / 型号', '省份 / 城市', '状态', ...(inventory ? ['运维负责人'] : ['客户 / 签约公司', '部门 / 业务负责人']), '所属公司'].map(label => <th key={label}>{label}</th>)}</tr></thead><tbody>{vehicles.map(vehicle => <tr key={vehicle.id}><td><Blur>{vehicle.plateNumber || vehicle.vin || '未提供'}</Blur></td><td>{vehicle.brandLabel || '—'} · {vehicle.type}<small>{vehicle.model}</small></td><td>{vehicle.province || '未标注'} / {vehicle.city || vehicle.location || '未标注'}</td><td>{stateLabel(vehicle)}</td>{inventory ? <td><Blur>{vehicle.opsManagers?.trim() || '-'}</Blur></td> : <><td><Blur>{vehicle.customerName || '—'}</Blur><small><Blur>{vehicle.orgName || '—'}</Blur></small></td><td><Blur>{vehicle.departmentName || '—'}</Blur><small><Blur>{vehicle.customerManager || '—'}</Blur></small></td></>}<td>{vehicle.subjectOrg || '—'}</td></tr>)}</tbody></table></div>;
 }
 
 type WeeklyDimension = 'date' | 'contract_type';

src/modules/assets/components/overview/FlowStatisticsCard.tsx

@@ -1,4 +1,4 @@
-import { CalendarDays, ChevronDown, Download, Loader2 } from 'lucide-react';
+import { CalendarDays, ChevronDown, Download, ListFilter, Loader2 } from 'lucide-react';
 import { AnimatePresence, motion } from 'motion/react';
 import type { FlowType } from '../../api';
 import { FLOW_META } from '../FlowDetailModal';
@@ -65,18 +65,24 @@ export function FlowStatisticsCard({
         <button
           type="button"
           data-testid="asset-flow-daily-toggle"
+          aria-expanded={flowDailyExpanded}
+          aria-controls="asset-flow-daily-details"
           onClick={() => setFlowDailyExpanded((prev) => !prev)}
-          className="mt-2 flex w-full items-center justify-between rounded-xl border border-slate-100 bg-white px-3 py-1.5 text-[12px] font-black text-slate-500 transition hover:border-blue-100 hover:bg-blue-50/50 hover:text-blue-600"
+          className="mt-3 flex min-h-16 w-full items-center justify-between gap-3 rounded-xl border border-blue-200 bg-blue-50 px-4 py-3 text-left text-blue-700 shadow-sm transition hover:border-blue-400 hover:bg-blue-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2"
         >
-          <span>{flowDailyExpanded ? '收起每日明细' : '展开每日明细'}</span>
-          <span className="flex items-center gap-2 text-[11px] text-slate-400">
-            {flowStats?.daily.length ?? 0} 天
-            <ChevronDown size={15} className={`transition-transform ${flowDailyExpanded ? 'rotate-180' : ''}`} />
+          <span className="flex min-w-0 items-center gap-3">
+            <span className="flex h-10 w-10 shrink-0 items-center justify-center rounded-xl bg-white text-blue-600"><ListFilter size={21} /></span>
+            <span><span className="block text-sm font-black">{flowDailyExpanded ? '收起每日明细' : '展开每日明细'}</span><span className="mt-0.5 block text-[11px] font-medium text-blue-600">查看每日交还车数量 · 最新日期在前</span></span>
+          </span>
+          <span className="flex shrink-0 items-center gap-2 text-xs font-bold">
+            <span className="rounded-lg bg-white px-2 py-1">{flowStats?.daily.length ?? 0} 天</span>
+            <ChevronDown size={20} className={`transition-transform ${flowDailyExpanded ? 'rotate-180' : ''}`} />
           </span>
         </button>
         <AnimatePresence initial={false}>
           {flowDailyExpanded && (
             <motion.div
+              id="asset-flow-daily-details"
               initial={{ height: 0, opacity: 0 }}
               animate={{ height: 'auto', opacity: 1 }}
               exit={{ height: 0, opacity: 0 }}

src/modules/assets/types.ts

@@ -104,6 +104,7 @@ export interface InventoryTypeSummary {
 }
 
 export interface VehicleListItem {
+  opsManagers?: string | null;
   color?: string;
   operationStatus?: string | null;
   inventoryKey?: string;

src/modules/energy/HydrogenDaily.tsx

@@ -28,6 +28,7 @@ export default function HydrogenDaily() {
   useEffect(() => {
     let cancelled = false;
     setError(null);
+    setRows(null);
     const query = pick === 'custom'
       ? { startDate: effectiveRange.start, endDate: effectiveRange.end }
       : { range: pick };
@@ -81,34 +82,13 @@ export default function HydrogenDaily() {
 
       <div className="grid grid-cols-2 gap-3 md:grid-cols-4">
         <MetricTile icon={Fuel} label={`${scopeLabel}加氢量`} value={totalKg.toLocaleString('zh-CN', { maximumFractionDigits: 1 })} unit="Kg" helper={rangeText} />
-        <MetricTile icon={Truck} label="车辆归属" value={customer === 'external' ? '外部' : '羚牛'} helper="当前筛选口径" tone="emerald" />
+        <MetricTile icon={Truck} label="车辆归属" value={customer === 'external' ? '外部' : '羚牛'} helper={customer === 'external' ? '佛山南海羚牛加氢站 · 未关联车辆的订单' : '当前筛选口径'} tone="emerald" />
         <MetricTile icon={TrendingUp} label="有效天数" value={`${activeDays}/${rows?.length ?? 0}`} helper={`日均 ${avgKg.toLocaleString('zh-CN', { maximumFractionDigits: 1 })} Kg`} tone="amber" />
         <MetricTile icon={Plug} label="涉及加氢站" value={stationCount} unit="站" helper="按明细站点去重" tone="slate" />
       </div>
 
-      {/* 外部车辆：新系统数据还没准备好 */}
-      {customer === 'external' && rows !== null && totalKg === 0 && (
-        <motion.div
-          initial={{ opacity: 0, y: 8 }}
-          animate={{ opacity: 1, y: 0 }}
-          className="bg-white rounded-2xl border border-slate-100 shadow-sm px-6 py-14 flex flex-col items-center text-center"
-        >
-          <div className="w-14 h-14 rounded-2xl bg-blue-50 flex items-center justify-center mb-3 relative">
-            <Plug size={22} className="text-blue-500" />
-            <span className="absolute -top-0.5 -right-0.5 w-3 h-3 rounded-full bg-blue-400 animate-ping" />
-            <span className="absolute -top-0.5 -right-0.5 w-3 h-3 rounded-full bg-blue-500" />
-          </div>
-          <div className="text-sm font-bold text-slate-700 mb-1">外部车辆 · 数据未就绪</div>
-          <div className="text-[11px] text-slate-400 max-w-[280px] leading-relaxed">
-            新系统的外部车辆加氢数据还在准备中
-            <br />
-            上线后此处将展示完整明细
-          </div>
-        </motion.div>
-      )}
-
-      {/* 时段加氢量柱图（外部车辆无数据时不渲染） */}
-      {!(customer === 'external' && totalKg === 0) && trendData.length > 0 && (
+      {/* 时段加氢量柱图 */}
+      {!error && trendData.length > 0 && totalKg > 0 && (
         <SurfaceCard>
           <div className="flex items-center justify-between px-4 pt-4 mb-2">
             <span className="text-sm font-bold text-slate-700">每日加氢量</span>
@@ -184,8 +164,7 @@ export default function HydrogenDaily() {
         </SurfaceCard>
       )}
 
-      {/* 表格（外部车辆 + 全 0 时不渲染，由上方友好空状态替代） */}
-      {!(customer === 'external' && rows !== null && totalKg === 0) && (
+      {/* 日明细：加载失败、无订单与正常数据分别展示。 */}
       <div className="bg-white rounded-2xl border border-slate-100 shadow-sm overflow-hidden">
         {/* 表头 */}
         <div className="grid grid-cols-[minmax(0,1fr)_84px_80px] md:grid-cols-[minmax(0,1fr)_140px_120px_104px] gap-2 md:gap-3 px-3 py-2 bg-slate-50 text-[11px] font-bold text-slate-500">
@@ -206,8 +185,8 @@ export default function HydrogenDaily() {
           <div className="p-3"><ErrorState message={error} /></div>
         ) : rows === null ? (
           <div className="p-3"><LoadingState label="正在加载加氢明细" /></div>
-        ) : rows.length === 0 ? (
-          <div className="p-3"><EmptyState title="暂无加氢数据" description="请切换时间范围或车辆归属" /></div>
+        ) : rows.length === 0 || totalKg === 0 ? (
+          <div className="p-3"><EmptyState title="所选时段暂无加氢数据" description={customer === 'external' ? '佛山南海羚牛加氢站在该时段没有未关联车辆的加氢订单，请切换时间范围' : '请切换时间范围或车辆归属'} /></div>
         ) : rows.map(r => {
           const open = expanded.has(r.date);
           const isAbnormal = Math.abs(r.chainPct) >= 0.3;
@@ -270,7 +249,6 @@ export default function HydrogenDaily() {
           );
         })}
       </div>
-      )}
 
     </div>
   );

src/server/routes/energy/hydrogen-daily.ts

@@ -39,7 +39,7 @@ export function registerHydrogenDailyRoute(
       HYDROGEN_BASE_WHERE_B,
       `b.${HYDROGEN_LOCAL} >= '${HYDROGEN_MIN_DATE}'`,
       dateRangeClause(`b.${HYDROGEN_LOCAL}`),
-      customerClause(customer).replaceAll('customer_price', 'b.customer_price').replaceAll('fee_total', 'b.fee_total'),
+      customerClause(customer),
     ].join(' AND ');
 
     // 站点级聚合（每日 × 每站）。前端组装成 day → stations

src/server/routes/energy/query-model.test.ts

@@ -1,5 +1,6 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
+import { DatabaseSync } from 'node:sqlite';
 import {
   customerClause,
   dateRangeClause,
@@ -7,10 +8,31 @@ import {
   resolveDateRange,
 } from './query-model.js';
 
-test('客户范围继续让外部车辆返回空数据', () => {
-  assert.equal(customerClause('external'), '1=0');
-  assert.equal(customerClause('lingniu'), '1=1');
-  assert.equal(customerClause('all'), '1=1');
+test('外部车辆只取佛山羚牛站未关联车辆的订单，车牌文字和收费不影响分类', () => {
+  const db = new DatabaseSync(':memory:');
+  try {
+    db.exec(`CREATE TABLE orders (
+      id INTEGER, station_id INTEGER, vehicle_id INTEGER,
+      license_plate TEXT, customer_price REAL, del_flag TEXT
+    );
+    INSERT INTO orders VALUES
+      (1, 341, NULL, '粤A外部', 38, '0'),
+      (2, 341, NULL, '', 0, '0'),
+      (3, 341, 123, '粤A羚牛', 38, '0'),
+      (4, 52, NULL, '粤A其他站', 38, '0'),
+      (5, NULL, NULL, '', 0, '0'),
+      (6, NULL, 456, '粤A未关联站点', 0, '0'),
+      (7, 341, NULL, '粤A已删除', 38, '1');`);
+    const ids = (kind: 'external' | 'lingniu' | 'all') => db
+      .prepare(`SELECT b.id FROM orders b WHERE b.del_flag = '0' AND ${customerClause(kind)} ORDER BY b.id`)
+      .all().map(row => row.id);
+    assert.deepEqual(ids('external'), [1, 2]);
+    assert.deepEqual(ids('lingniu'), [3, 4, 5, 6]);
+    assert.deepEqual(ids('all'), [1, 2, 3, 4, 5, 6]);
+    assert.deepEqual([...ids('external'), ...ids('lingniu')].sort(), ids('all'));
+  } finally {
+    db.close();
+  }
 });
 
 test('能源日期快捷区间继续按本地自然日计算', () => {

src/server/routes/energy/query-model.ts

@@ -8,10 +8,14 @@ export interface EnergyDateRange {
 
 const YMD_RE = /^\d{4}-\d{2}-\d{2}$/;
 
-// 新账本目前只承载羚牛车辆订单；外部车辆仍需返回空集合而不是混用羚牛数据。
+// 主数据 ID 341：佛山南海羚牛加氢站。车牌文字存在不代表已关联车辆。
+const FOSHAN_LINGNIU_STATION_ID = 341;
+
+// 日明细账本使用别名 b；两类互斥，其他订单继续保留在原羚牛范围内。
 export function customerClause(customer: CustomerKind): string {
-  if (customer === 'external') return '1=0';
-  if (customer === 'lingniu') return '1=1';
+  const external = `(COALESCE(b.station_id, 0) = ${FOSHAN_LINGNIU_STATION_ID} AND b.vehicle_id IS NULL)`;
+  if (customer === 'external') return external;
+  if (customer === 'lingniu') return `NOT ${external}`;
   return '1=1';
 }
 

src/server/routes/energy/routes.test.ts

@@ -105,6 +105,11 @@ test('四个处理器保持缓存和参数契约，加氢站点使用新主数
     '/hydrogen/daily?startDate=2025-01-01&endDate=2025-01-02&customer=external&force=1',
   );
   assert.equal(dailyResponse.status, 200);
+  assert.deepEqual(await dailyResponse.json(), [
+    { date: '2025-01-02', totalKg: 10, chainPct: 0, customerType: 'external',
+      stations: [{ name: '测试站', pricePerKg: 35, kg: 10, chainPct: 0 }] },
+    { date: '2025-01-01', totalKg: 0, chainPct: 0, customerType: 'external', stations: [] },
+  ]);
 
   const electricApp = new Hono();
   const electricDependencies = {
@@ -127,7 +132,7 @@ test('四个处理器保持缓存和参数契约，加氢站点使用新主数
     { key: 'electric/monthly?customer=external&start=2025-01-01&end=2025-01-02', force: true },
   ]);
 
-  // 指纹来自拆分前的 13 条 SQL，连空白符变化也会使测试失败。
+  // 保留查询契约指纹；日明细已更新为佛山羚牛站未关联车辆的外部订单筛选。
   assert.deepEqual(
     [...hydrogenCalls, ...electricCalls].map(call => sqlHash(call.sql)),
     [
@@ -138,7 +143,7 @@ test('四个处理器保持缓存和参数契约，加氢站点使用新主数
       '256ac8309d5a',
       'dac9e86fc527',
       'a71da8f05765',
-      '24b23780a259',
+      'd1620280f520',
       '226fd8f950a1',
       '6e4031b10926',
       '4fc77463294c',

src/server/routes/vehicles.ts

@@ -544,6 +544,7 @@ function vehicleListItem(v: Vehicle) {
       subjectOrg: v.subjectOrg,
       departmentName: v.departmentName,
       customerManager: v.customerManager,
+      opsManagers: v.opsManagers || null,
       brandLabel: v.brandLabel,
       orgName: v.orgName,
     };

src/server/routes/vehicles/model.test.ts

@@ -199,6 +199,7 @@ test('transforms database rows without changing the route model contract', () =>
     subjectOrg: '主体',
     projectName: '项目',
     customerManager: '经理',
+    opsManagers: null,
     managerId: '9',
     brandLabel: '现代',
   });

src/server/routes/vehicles/model.ts

@@ -255,6 +255,7 @@ export function transformRow(row: VehicleRow): Vehicle {
     subjectOrg: row.主体,
     projectName: row.项目名称,
     customerManager: row.客户经理,
+    opsManagers: row.ops_managers?.trim() || null,
     managerId: row.经理ID || null,
     brandLabel: row.车辆品牌Label,
   };

src/server/routes/vehicles/repository.ts

@@ -100,6 +100,11 @@ export const MAIN_SQL = `SELECT
     NULLIF(vi.registered_ownership, '') AS 主体,
     vor.project_name AS 项目名称,
     vor.business_manager AS 客户经理,
+    (SELECT GROUP_CONCAT(
+       COALESCE(NULLIF(TRIM(ops.nick_name), ''), NULLIF(TRIM(ops.user_name), ''), CAST(ops.user_id AS CHAR))
+       ORDER BY ops.id SEPARATOR '、')
+     FROM vehicle_ops_manager_rel ops
+     WHERE ops.vehicle_id = vi.id AND ops.del_flag = '0') AS ops_managers,
     CAST(COALESCE(c.business_manager_id, vi.business_id) AS CHAR) AS 经理ID
 FROM vehicle_info vi
 LEFT JOIN vehicle_status vs

src/server/types.ts

@@ -1,6 +1,7 @@
 import type { AbnormalMoveDetail } from '../shared/assets/abnormal-move.js';
 
 export interface VehicleRow {
+  ops_managers?: string | null;
   pending_delivery_id?: string | null;
   pending_contract_no?: string | null;
   pending_customer_name?: string | null;
@@ -42,6 +43,7 @@ export interface VehicleRow {
 }
 
 export interface Vehicle {
+  opsManagers?: string | null;
   pendingDelivery?: { contractNo: string | null; customerName: string | null } | null;
   abnormalMove?: AbnormalMoveDetail | null;
   id: string;