execl问题修复v2

control-plane/src/passenger-roster-workbook.ts

@@ -13,7 +13,7 @@ const ABSOLUTE_MAX_DATA_ROWS = 5_000;
 const MAX_PASSENGER_SEQUENCE = 5_000;
 const MAX_HEADER_ROW = 100;
 
-export const PASSENGER_ROSTER_WORKBOOK_VERSION = 'ltjt-passenger-roster-workbook-v1.4.0';
+export const PASSENGER_ROSTER_WORKBOOK_VERSION = 'ltjt-passenger-roster-workbook-v1.5.0';
 
 const REQUIRED_SOURCE_FIELDS = [
   '序号', '姓名', '英文姓名', '性别', '出生日期', '出生地', '护照号码',
@@ -70,6 +70,7 @@ export type PassengerRosterWorkbookErrorCode =
   | 'roster_workbook_formula_not_allowed'
   | 'roster_workbook_formula_result_missing'
   | 'roster_workbook_non_contiguous_rows'
+  | 'roster_workbook_incomplete_row'
   | 'roster_workbook_row_limit'
   | 'roster_workbook_no_data'
   | 'roster_workbook_invalid_sequence'
@@ -96,6 +97,7 @@ const ERROR_MESSAGES: Record<PassengerRosterWorkbookErrorCode, string> = {
   roster_workbook_formula_not_allowed: '名单必需字段包含不允许的公式',
   roster_workbook_formula_result_missing: '名单必需字段公式没有可验证的缓存结果',
   roster_workbook_non_contiguous_rows: '名单数据行不连续',
+  roster_workbook_incomplete_row: '名单中间存在未填写旅客资料的模板行',
   roster_workbook_row_limit: '名单数据行数超过技术限制',
   roster_workbook_no_data: '名单工作簿没有数据行',
   roster_workbook_invalid_sequence: '名单序号必须是正整数',
@@ -390,10 +392,63 @@ function rowHasData(row: ExcelJS.Row, sourceColumns: readonly number[]): boolean
   return false;
 }
 
+// These two legacy template formulas derive gender/birth date from a deleted
+// identity-card column. Recognize the exact broken templates, not arbitrary
+// formulas or their cached results, when deciding whether a tail row is unused.
+const BROKEN_TEMPLATE_FORMULAS: Partial<Record<RequiredSourceField, string>> = {
+  性别: 'IF(OR(LEN(#REF!)=15,LEN(#REF!)=18),IF(MOD(MID(#REF!,15,3)*1,2),"男","女"),NA())',
+  出生日期: 'DATE(MID(#REF!,7,VLOOKUP(LEN(#REF!),{15,2;18,4},2,0)),MID(#REF!,VLOOKUP(LEN(#REF!),{15,9;18,11},2,0),2),MID(#REF!,VLOOKUP(LEN(#REF!),{15,11;18,13},2,0),2))'
+};
+
+function unusedTemplateRow(row: ExcelJS.Row, headerRow: number, sourceColumns: SourceColumnMap): boolean {
+  const sequenceCell = row.getCell(sourceColumns['序号']);
+  if (sequenceCell.type === ExcelJS.ValueType.Formula) return false;
+  const sequence = normalizedText(scalarValue(sequenceCell));
+  if (sequence && (!/^[1-9]\d*$/.test(sequence) || Number(sequence) > MAX_PASSENGER_SEQUENCE)) return false;
+  for (const field of REQUIRED_SOURCE_FIELDS) {
+    if (field === '序号') continue;
+    const cell = row.getCell(sourceColumns[field]);
+    if (cell.type === ExcelJS.ValueType.Formula) {
+      const template = BROKEN_TEMPLATE_FORMULAS[field];
+      if (!formulaAllowed(cell, headerRow, sourceColumns)
+        && (!template || normalizedFormula(cell.formula) !== normalizedFormula(template))) return false;
+    } else if (normalizedText(scalarValue(cell)) !== '') {
+      return false;
+    }
+  }
+  return true;
+}
+
+function mergedTemplateNote(row: ExcelJS.Row, headerRow: number, sourceColumns: SourceColumnMap): boolean {
+  const columns = Object.values(sourceColumns);
+  const master = row.getCell(Math.min(...columns)).master;
+  if (!master.isMerged || cellRow(master) <= headerRow
+    || !columns.every(column => row.getCell(column).master.address === master.address)) return false;
+  // A footer must span every imported column and be explicitly labelled. Any
+  // separate populated cell keeps the row in the roster for normal validation.
+  let onlyNote = true;
+  row.eachCell({ includeEmpty: false }, cell => {
+    if (cell.master.address !== master.address && cellHasData(cell)) onlyNote = false;
+  });
+  return onlyNote && /^(?:备注|说明|注意事项|温馨提示)[：:]/.test(headerText(master));
+}
+
+function lastRosterRow(sheet: ExcelJS.Worksheet, headerRow: number, sourceColumns: SourceColumnMap): number {
+  let lastRow = sheet.rowCount;
+  while (lastRow > headerRow) {
+    const row = sheet.getRow(lastRow);
+    if (!mergedTemplateNote(row, headerRow, sourceColumns)
+      && !unusedTemplateRow(row, headerRow, sourceColumns)) break;
+    lastRow--;
+  }
+  return lastRow;
+}
+
 function validateFormulasAndHiddenData(
   sheet: ExcelJS.Worksheet,
   headerRow: number,
-  sourceColumns: SourceColumnMap
+  sourceColumns: SourceColumnMap,
+  lastDataRow: number
 ): void {
   const selectedColumns = new Set(Object.values(sourceColumns));
   sheet.eachRow({ includeEmpty: false }, (row, rowNumber) => {
@@ -405,7 +460,7 @@ function validateFormulasAndHiddenData(
         if (containsExternalFormulaReference(formula)) {
           fail('roster_workbook_unsafe_content', { row: rowNumber, column: columnNumber });
         }
-        if (selectedColumns.has(columnNumber) && !formulaAllowed(cell, headerRow, sourceColumns)) {
+        if (rowNumber <= lastDataRow && selectedColumns.has(columnNumber) && !formulaAllowed(cell, headerRow, sourceColumns)) {
           fail('roster_workbook_formula_not_allowed', { row: rowNumber, column: columnNumber });
         }
       }
@@ -547,12 +602,13 @@ function dataRows(
   sheet: ExcelJS.Worksheet,
   headerRow: number,
   sourceColumns: SourceColumnMap,
-  maxDataRows: number
+  maxDataRows: number,
+  lastDataRow: number
 ): ExcelJS.Row[] {
   const rows: ExcelJS.Row[] = [];
   let gapAfterData = false;
   const selectedColumns = Object.values(sourceColumns);
-  for (let rowNumber = headerRow + 1; rowNumber <= sheet.rowCount; rowNumber += 1) {
+  for (let rowNumber = headerRow + 1; rowNumber <= lastDataRow; rowNumber += 1) {
     const row = sheet.getRow(rowNumber);
     const hasData = rowHasData(row, selectedColumns);
     if (!hasData) {
@@ -560,6 +616,9 @@ function dataRows(
       continue;
     }
     if (gapAfterData) fail('roster_workbook_non_contiguous_rows', { row: rowNumber });
+    if (unusedTemplateRow(row, headerRow, sourceColumns)) {
+      fail('roster_workbook_incomplete_row', { row: rowNumber, column: sourceColumns['姓名'] });
+    }
     rows.push(row);
     if (rows.length > maxDataRows) fail('roster_workbook_row_limit');
   }
@@ -654,8 +713,11 @@ export async function normalizePassengerRosterWorkbook(
   if (sheet.state !== 'visible') fail('roster_workbook_hidden_data');
   const header = findHeaderLayout(sheet);
   const headerRow = header.row;
-  validateFormulasAndHiddenData(sheet, headerRow, header.columns);
-  const rows = dataRows(sheet, headerRow, header.columns, maxDataRows);
+  const lastDataRow = lastRosterRow(sheet, headerRow, header.columns);
+  // Content safety and hidden-data checks still cover the entire workbook,
+  // including discarded placeholders and footnotes.
+  validateFormulasAndHiddenData(sheet, headerRow, header.columns, lastDataRow);
+  const rows = dataRows(sheet, headerRow, header.columns, maxDataRows, lastDataRow);
   const date1904 = workbook.properties.date1904 === true;
   const seenSequences = new Set<number>();
   const canonicalRows = rows.map((row) => canonicalRow(row, date1904, seenSequences, header.columns));

control-plane/test/passenger-roster-template-tail.test.ts

@@ -0,0 +1,163 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import ExcelJS from 'exceljs';
+import { parseProgramInput } from '../src/program-parser.js';
+import { normalizePassengerRosterWorkbook, PassengerRosterWorkbookError } from '../src/passenger-roster-workbook.js';
+
+const headers = ['序号', '姓名', '英文姓名', '性别', '出生日期', '出生地', '护照号码', '签发地', '签发日期', '有效期', '电话', '备注'];
+const genderFormula = 'IF(OR(LEN(#REF!)=15,LEN(#REF!)=18),IF(MOD(MID(#REF!,15,3)*1,2),"男","女"),NA())';
+const birthFormula = 'DATE(MID(#REF!,7,VLOOKUP(LEN(#REF!),{15,2;18,4},2,0)),MID(#REF!,VLOOKUP(LEN(#REF!),{15,9;18,11},2,0),2),MID(#REF!,VLOOKUP(LEN(#REF!),{15,11;18,13},2,0),2))';
+type Mutation = (sheet: ExcelJS.Worksheet) => void;
+
+function addPlaceholder(sheet: ExcelJS.Worksheet, row: number, sequence: number): void {
+  sheet.getCell(`A${row}`).value = sequence;
+  sheet.getCell(`D${row}`).value = { formula: genderFormula, result: { error: '#REF!' } };
+  sheet.getCell(`E${row}`).value = { formula: birthFormula, result: { error: '#REF!' } };
+  sheet.getCell(`J${row}`).value = { formula: `EDATE(I${row},10*12)-1`, result: 36500 };
+}
+
+function addNote(sheet: ExcelJS.Worksheet, firstRow: number, lastRow = firstRow): void {
+  sheet.mergeCells(`A${firstRow}:L${lastRow}`);
+  sheet.getCell(`A${firstRow}`).value = { richText: [{ text: '备注：' }, { text: '合成模板用房说明' }] };
+}
+
+async function workbook(...mutations: Mutation[]): Promise<Buffer> {
+  const book = new ExcelJS.Workbook();
+  const sheet = book.addWorksheet('Sheet1');
+  sheet.addRow(['合成名单模板']);
+  sheet.addRow(headers);
+  for (let sequence = 1; sequence <= 28; sequence++) {
+    const row = sequence + 2;
+    sheet.addRow([sequence, `合成游客${sequence}`, `SYNTHETIC ${sequence}`, '男', '1990-01-02', '合成城市',
+      `SYNTH${sequence}`, '合成城市', '2025-01-02',
+      { formula: `EDATE(I${row},10*12)-1`, result: new Date('2035-01-01T00:00:00Z') },
+      sequence === 1 ? '13800000001' : '', sequence === 1 ? '领队' : '']);
+  }
+  for (const mutate of mutations) mutate(sheet);
+  return Buffer.from(await book.xlsx.writeBuffer());
+}
+
+const normalize = (content: Buffer) => normalizePassengerRosterWorkbook({ content, fileName: 'synthetic.xlsx', contentType: 'application/octet-stream' });
+
+async function rejects(content: Buffer, code: string, row?: number): Promise<void> {
+  await assert.rejects(() => normalize(content), (error: unknown) => {
+    assert.ok(error instanceof PassengerRosterWorkbookError);
+    assert.equal(error.code, code);
+    if (row !== undefined) assert.equal(error.row, row);
+    return true;
+  });
+}
+
+test('roster tail: 28 passengers survive stale template formulas and a merged footer unchanged', async () => {
+  const expected = await normalize(await workbook());
+  const content = await workbook(sheet => {
+    addPlaceholder(sheet, 31, 29);
+    addPlaceholder(sheet, 32, 30);
+    addNote(sheet, 33, 34);
+  });
+  const result = await normalize(content);
+  assert.equal(result.headerRow, 2);
+  assert.equal(result.rowCount, 28);
+  assert.equal(result.canonicalTsv, expected.canonicalTsv);
+  const parsed = await parseProgramInput({
+    rawText: `导入独立团名单\n单号：SYNTH-ORDER-001\n名单内容：\n${result.canonicalTsv}`,
+    receivedAt: '2026-09-11T03:21:08Z'
+  });
+  assert.equal(parsed.status, 'agent_parse_passed');
+  assert.equal((parsed.operation as any).data.passenger_list.row_count, 28);
+  assert.deepEqual((parsed.operation as any).data.passenger_list.leader_contact, { sequence: 1, name: '合成游客1', phone: '13800000001' });
+});
+
+test('roster tail: sequence-only placeholders and separated trailing notes are not passengers', async () => {
+  for (const mutate of [
+    (sheet: ExcelJS.Worksheet) => { sheet.getCell('A31').value = 29; sheet.getCell('A32').value = 30; },
+    (sheet: ExcelJS.Worksheet) => { addNote(sheet, 32, 33); },
+    (sheet: ExcelJS.Worksheet) => { addPlaceholder(sheet, 32, 29); addNote(sheet, 34); }
+  ]) {
+    assert.equal((await normalize(await workbook(mutate))).rowCount, 28);
+  }
+});
+
+test('roster tail: recognition follows semantic columns after reordering', async () => {
+  const expected = await normalize(await workbook());
+  const result = await normalize(await workbook(sheet => {
+    addPlaceholder(sheet, 31, 29);
+    addNote(sheet, 32, 33);
+    for (let row = 2; row <= 31; row++) {
+      const first = sheet.getCell(`A${row}`).value;
+      sheet.getCell(`A${row}`).value = sheet.getCell(`L${row}`).value;
+      sheet.getCell(`L${row}`).value = first;
+    }
+  }));
+  assert.equal(result.canonicalTsv, expected.canonicalTsv);
+});
+
+test('roster tail: any supplied passenger field keeps a row subject to strict formula validation', async () => {
+  for (const [column, value] of [['B', '合成姓名'], ['C', 'SYNTH NAME'], ['F', '合成出生地'],
+    ['G', 'SYNTH-PASSPORT'], ['H', '合成签发地'], ['I', '2025-01-01'], ['K', '13800000001'], ['L', '领队']]) {
+    await rejects(await workbook(sheet => {
+      addPlaceholder(sheet, 31, 29);
+      sheet.getCell(`${column}31`).value = value;
+    }), 'roster_workbook_formula_not_allowed', 31);
+  }
+  await rejects(await workbook(sheet => {
+    sheet.getCell('D30').value = { formula: genderFormula, result: { error: '#REF!' } };
+    addPlaceholder(sheet, 31, 29);
+  }), 'roster_workbook_formula_not_allowed', 30);
+});
+
+test('roster tail: unrecognized formulas and notes cannot be silently discarded', async () => {
+  for (const formula of ['"男"', 'IF(A3=1,"男","女")', 'IFERROR(#REF!,"男")']) {
+    await rejects(await workbook(sheet => {
+      addPlaceholder(sheet, 31, 29);
+      sheet.getCell('D31').value = { formula, result: '男' };
+    }), 'roster_workbook_formula_not_allowed', 31);
+  }
+  await rejects(await workbook(sheet => { sheet.getCell('A31').value = '未知尾部内容'; }), 'roster_workbook_invalid_sequence', 31);
+  await rejects(await workbook(sheet => {
+    addNote(sheet, 31);
+    sheet.getCell('M31').value = '附加实际内容';
+  }), 'roster_workbook_invalid_sequence', 31);
+});
+
+test('roster tail: placeholders or notes inside the roster never hide later passengers', async () => {
+  await rejects(await workbook(sheet => {
+    sheet.getRow(15).values = [];
+    addPlaceholder(sheet, 15, 13);
+  }), 'roster_workbook_formula_not_allowed', 15);
+  await rejects(await workbook(sheet => {
+    sheet.getRow(15).values = [13];
+  }), 'roster_workbook_incomplete_row', 15);
+  await rejects(await workbook(sheet => {
+    sheet.getRow(15).values = [];
+  }), 'roster_workbook_non_contiguous_rows', 16);
+  await rejects(await workbook(sheet => {
+    sheet.getRow(15).values = [];
+    addNote(sheet, 15);
+  }), 'roster_workbook_invalid_sequence', 15);
+});
+
+test('roster tail: empty templates do not create phantom passengers', async () => {
+  await rejects(await workbook(sheet => {
+    for (let row = 3; row <= 30; row++) {
+      sheet.getRow(row).values = [];
+      addPlaceholder(sheet, row, row - 2);
+    }
+    addNote(sheet, 31);
+  }), 'roster_workbook_no_data');
+});
+
+test('roster tail: active content and hidden required data remain blocked across the whole sheet', async () => {
+  for (const column of ['D', 'M']) {
+    await rejects(await workbook(sheet => {
+      addPlaceholder(sheet, 31, 29);
+      sheet.getCell(`${column}31`).value = { formula: 'WEBSERVICE("https://invalid.example")', result: '' };
+    }), 'roster_workbook_unsafe_content', 31);
+  }
+  await rejects(await workbook(sheet => {
+    addPlaceholder(sheet, 31, 29);
+    sheet.getCell('M31').value = { text: '链接', hyperlink: 'https://invalid.example' };
+  }), 'roster_workbook_unsafe_content');
+  await rejects(await workbook(sheet => { addPlaceholder(sheet, 31, 29); sheet.getRow(31).hidden = true; }), 'roster_workbook_hidden_data', 31);
+  await rejects(await workbook(sheet => { addPlaceholder(sheet, 31, 29); sheet.getColumn('D').hidden = true; }), 'roster_workbook_hidden_data');
+});