fix: include automatic order archives in PDF ledger

This commit is contained in:
abaishu0730 committed 2026-10-27 09:26:47 +08:00
1 parent 95eca01d5b
commit 39afafefa7
6 files changed
+43 -6

No files matched your search

+8
View File
@@ -1,5 +1,13 @@
# 开发交接(2026-10-23)
## 2026-10-27 PDF导出记录接入自动归档
- 原PDF台账仅查询手工pdf_jobs,自动订单的archive回执完全独立,造成成功归档但列表为空。台账现在只读合并两种来源,先权限过滤与筛选,再统一排序分页;无需补造任务或重新生成PDF。
- 自动记录标记BPM订单自动归档,保留订单号、流水号、项目/型号和归档时间,下载复用原订单文件接口的权限/哈希检查。列表“已归档(下载时校验)”只代表持久回执,不冒充实时文件检查;手工文件继续原可用性校验。
- 已移除订单与其他负责人的连接数据不进入自动记录;已发邮件的订单归档继续可查。诊断output目录里的离线PDF不作为业务记录。当前只读核对有5条业务自动归档,合并查询可找到。
- 验证:182项当前业务回归通过;导出记录/分页导航专项19项通过。独立复核发现的实际项目字段优先级已修复并补回归。
- 专项覆盖超过三页合并分页、搜索、末页回退、权限、软移除、已发送订单、实际项目字段及列表/弹窗下载链接。更新本机服务前备份,保留运行数据、规则和测试期限;不生成PDF、不手动发信、不操作BPM。
## 2026-10-27 通用表单适配与停止重复巡检
- 用户取消每6小时巡检;自动化已删除,应用的五天测试期限及原开关不变。
+1 -1
View File
@@ -13,7 +13,7 @@
"service:stop": "node scripts/service.cjs stop",
"service:restart": "node scripts/service.cjs restart",
"test": "npm run test:business",
"test:business": "node --test --test-concurrency=1 tests/order-rules/version-compatibility.test.cjs tests/bpm-display-policy.test.cjs tests/bpm-dynamicarea.test.cjs tests/bpm-readonly-form.test.cjs tests/bpm-form-contracts.test.cjs tests/bpm-obsolete-display-fields.test.cjs tests/order-rules/snapshot-read-context.test.cjs tests/order-rules/summary.test.cjs tests/order-rules/execution-single-flight.test.cjs tests/order-rules/execution-responsiveness.test.cjs tests/order-rules/readiness-pending-ui.test.cjs tests/dependency-compatibility.test.cjs tests/order-rules/slow-cutoff.test.cjs tests/order-rules/removed-discovery-barrier.test.cjs tests/mail/sample-send.test.cjs tests/mail/template-editing.test.cjs tests/mail/template-editor-ui.test.cjs tests/order-rules/scope-catalog.test.cjs tests/order-rules/field-mapping-ui.test.cjs tests/order-rules/scope-search-ui.test.cjs tests/order-rules/excel-import-contract.test.cjs tests/order-rules/excel-execution-bridge.test.cjs tests/order-rules/excel-import-flow-ui.test.cjs tests/order-rules/collecting-batches.test.cjs tests/order-rules/collecting-batches-ui.test.cjs tests/order-rules/query.test.cjs tests/order-rules/scheduled-mail-policy.test.cjs",
"test:business": "node --test --test-concurrency=1 tests/app/automatic-pdf-ledger.test.cjs tests/app/job-records.test.cjs tests/order-rules/version-compatibility.test.cjs tests/bpm-display-policy.test.cjs tests/bpm-dynamicarea.test.cjs tests/bpm-readonly-form.test.cjs tests/bpm-form-contracts.test.cjs tests/bpm-obsolete-display-fields.test.cjs tests/order-rules/snapshot-read-context.test.cjs tests/order-rules/summary.test.cjs tests/order-rules/execution-single-flight.test.cjs tests/order-rules/execution-responsiveness.test.cjs tests/order-rules/readiness-pending-ui.test.cjs tests/dependency-compatibility.test.cjs tests/order-rules/slow-cutoff.test.cjs tests/order-rules/removed-discovery-barrier.test.cjs tests/mail/sample-send.test.cjs tests/mail/template-editing.test.cjs tests/mail/template-editor-ui.test.cjs tests/order-rules/scope-catalog.test.cjs tests/order-rules/field-mapping-ui.test.cjs tests/order-rules/scope-search-ui.test.cjs tests/order-rules/excel-import-contract.test.cjs tests/order-rules/excel-execution-bridge.test.cjs tests/order-rules/excel-import-flow-ui.test.cjs tests/order-rules/collecting-batches.test.cjs tests/order-rules/collecting-batches-ui.test.cjs tests/order-rules/query.test.cjs tests/order-rules/scheduled-mail-policy.test.cjs",
"test:full": "node --test --test-concurrency=2 \"tests/**/*.test.cjs\""
},
"engines": {
+1 -1
View File
@@ -20,7 +20,7 @@ const handled=(...args)=>{reply(...args);return true;};
}
if(route==='/api/jobs' && request.method==='GET'){
const params=new URL(request.url,'http://localhost').searchParams;
if(params.get('view')==='ledger'){const filters={};for(const key of ['q','status','page','pageSize'])if(params.has(key))filters[key]=['page','pageSize'].includes(key)?Number(params.get(key)):params.get(key);if(store.jobPage){const page=store.jobPage(filters);return handled(200,{...page,jobs:await publicJobs(page.jobs,outputDir,storage?.store)});}return handled(200,await queryJobs({jobs:store.jobs(),outputDir,archiveStore:storage?.store},filters));}
if(params.get('view')==='ledger'){const filters={};for(const key of ['q','status','page','pageSize'])if(params.has(key))filters[key]=['page','pageSize'].includes(key)?Number(params.get(key)):params.get(key);return handled(200,await require('./pdf-ledger.cjs').queryPdfLedger({jobs:store.jobs(),outputDir,archiveStore:storage?.store,orderRules,workspace,user},filters));}
return handled(200,{jobs:await publicJobs(store.jobs(),outputDir,storage?.store)});
}
if(route==='/api/audit' && request.method==='GET')return handled(200,{audit:store.audit()});
+18
View File
@@ -0,0 +1,18 @@
'use strict';
const {normalizeJobQuery,publicJobs}=require('./job-records.cjs');
const {canReadOrder}=require('../order-rules/access.cjs');
// Project existing archive receipts at read time. No duplicate export jobs or
// backfill writes; historical business archives appear immediately.
function archivedJobs(orderRules,workspace,user){
return (orderRules?.all('orders')||[]).filter(o=>!o.removedAt&&canReadOrder(workspace,user,o)).flatMap(order=>(order.archive?.files||[]).flatMap((file,index)=>{
if(file.kind!=='pdf'||!file.name||!Number.isSafeInteger(file.size)||!/^[a-f0-9]{64}$/i.test(file.sha256||'')||!(order.categoryId||order.ruleSnapshot?.id))return [];
return [{jobId:'order:'+order.id+':'+index,status:'success',sourceType:'order-archive',sourceLabel:'BPM 订单自动归档',connectionId:order.sample?.connectionId||order.event?.connectionId||order.connectionId,metadata:{order:order.event?.orderNo||order.orderNo,serial:order.event?.serialNum,project:order.event?.project||order.ruleSnapshot?.name||order.event?.processName,model:order.event?.model},filename:file.name,createdAt:order.archive.archivedAt,updatedAt:order.archive.archivedAt,downloadable:true,downloadUrl:'/api/order-rules/orders/'+encodeURIComponent(order.id)+'/files/'+index,fileStatus:'archived',fileBytes:file.size,fileCheckedAt:null,archiveKnown:true,archiveReceipts:[{id:order.id+':'+index,status:'success',serverName:'订单归档目录',relativePath:file.name,finishedAt:order.archive.archivedAt}]}];
}));
}
async function queryPdfLedger({jobs,outputDir,archiveStore,orderRules,workspace,user},input={}){
const {q,status,page,pageSize}=normalizeJobQuery(input),needle=q.trim().toLowerCase();
const rows=[...jobs.map(job=>({job,manual:true})),...archivedJobs(orderRules,workspace,user).map(job=>({job,manual:false}))].filter(({job:j})=>(!status||j.status===status)&&(!needle||[j.metadata?.order,j.metadata?.project,j.metadata?.model,j.metadata?.serial,j.filename].join(' ').toLowerCase().includes(needle))).sort((a,b)=>String(b.job.updatedAt||'').localeCompare(String(a.job.updatedAt||''))||String(a.job.jobId).localeCompare(String(b.job.jobId)));
const actualPage=Math.min(page,Math.max(1,Math.ceil(rows.length/pageSize))),selected=rows.slice((actualPage-1)*pageSize,actualPage*pageSize),manual=await publicJobs(selected.filter(r=>r.manual).map(r=>r.job),outputDir,archiveStore);let index=0;
return {jobs:selected.map(r=>r.manual?{...manual[index++],sourceType:'manual',sourceLabel:'浏览器手工导出',downloadUrl:'/api/jobs/'+encodeURIComponent(r.job.jobId)+'/file'}:r.job),total:rows.length,page:actualPage,pageSize};
}
module.exports={queryPdfLedger};
+11
View File
@@ -0,0 +1,11 @@
'use strict';
const test=require('node:test'),assert=require('node:assert/strict');
const {queryPdfLedger}=require('../../src/modules/dashboard/pdf-ledger.cjs');
const admin={username:'admin',role:'admin'},workspace={recordSources:()=>[{id:'a',owner:'alice'},{id:'b',owner:'bob'}]};
const order=(id,connectionId='a')=>({id,categoryId:'overseas',sample:{connectionId},event:{orderNo:id,serialNum:'SN-'+id,processName:'流程',nodeName:'通知'},ruleSnapshot:{name:'类别'},archive:{archivedAt:'2026-10-27T01:00:00Z',files:[{name:id+'.pdf',path:'C:\\private\\'+id+'.pdf',kind:'pdf',size:123,sha256:'a'.repeat(64)}]}});
function context(orders){return {jobs:[{jobId:'manual',status:'error',updatedAt:'2026-10-26T01:00:00Z',metadata:{order:'MANUAL'}}],outputDir:'.',orderRules:{all:k=>k==='orders'?orders:[]},workspace,user:admin};}
test('PDF ledger combines automatic archives and manual exports before search sorting and pagination',async()=>{const c=context(Array.from({length:76},(_,i)=>order('ORDER-'+i)));const p=await queryPdfLedger(c,{page:4});assert.equal(p.total,77);assert.equal(p.jobs.length,2);assert.equal(p.jobs.at(-1).jobId,'manual');const found=await queryPdfLedger(c,{q:'SN-ORDER-2',status:'success'});assert.equal(found.total,11);const auto=found.jobs[0];assert.equal(auto.sourceType,'order-archive');assert.equal(auto.fileStatus,'archived');assert.match(auto.downloadUrl,/^\/api\/order-rules\/orders\/ORDER-/);assert.equal(auto.archiveReceipts[0].status,'success');assert.doesNotMatch(JSON.stringify(found),/private|sha256/);assert.equal((await queryPdfLedger(c,{page:100})).page,4);});
test('automatic PDF rows obey connection access and removal while retaining archived sent orders',async()=>{const a=order('A'),b=order('B','b'),removed={...order('OLD'),removedAt:'now'},unarchived={...order('NONE'),archive:null};a.status='sent';const c=context([a,b,removed,unarchived]);c.user={username:'alice',role:'viewer'};const r=await queryPdfLedger(c);assert.deepEqual(r.jobs.filter(j=>j.sourceType==='order-archive').map(j=>j.metadata.order),['A']);c.user={username:'nobody',role:'operator'};assert.equal((await queryPdfLedger(c,{status:'success'})).total,0);});
test('dashboard ledger route uses merged records even when manual SQL pagination is available',async()=>{const {dashboardApi}=require('../../src/modules/dashboard/api.cjs');let response;const c=context([order('A')]);await dashboardApi({...c,store:{jobs:()=>c.jobs,jobPage:()=>{throw Error('must not paginate manual records first');}},route:'/api/jobs',request:{method:'GET',url:'/api/jobs?view=ledger&status=success'},reply:(status,body)=>response={status,body}});assert.equal(response.status,200);assert.equal(response.body.total,1);assert.equal(response.body.jobs[0].metadata.order,'A');});
test('PDF ledger renders automatic source and uses the order archive download route in list and detail',async t=>{const f=await require('../fixtures/records-app.cjs').setup(t),page=await f.page('#records-pdf');const payload=await queryPdfLedger(context([order('AUTO-TEST')]));await page.route('**/api/jobs?*',route=>route.fulfill({json:payload}));await page.reload();const row=page.locator('[data-pdf-row]').filter({hasText:'AUTO-TEST'});await row.waitFor();assert.match(await row.innerText(),/BPM 订单自动归档/);assert.equal(await row.getByRole('link',{name:'下载 PDF'}).getAttribute('href'),'/api/order-rules/orders/AUTO-TEST/files/0');await row.getByRole('button',{name:'查看详情'}).click();const detail=page.getByRole('dialog');await detail.waitFor();assert.match(await detail.innerText(),/BPM 订单自动归档/);assert.equal(await detail.getByRole('link',{name:'下载 PDF'}).getAttribute('href'),'/api/order-rules/orders/AUTO-TEST/files/0');});
test('automatic PDFs preserve actual project and model for display and search',async()=>{const o=order('A');o.event.project='PROJECT-EXACT';o.event.model='MODEL-EXACT';const r=await queryPdfLedger(context([o]),{q:'PROJECT-EXACT'});assert.equal(r.total,1);assert.equal(r.jobs[0].metadata.project,'PROJECT-EXACT');assert.equal(r.jobs[0].metadata.model,'MODEL-EXACT');});
+4 -4
View File
@@ -3,12 +3,12 @@ window.PdfRecordViews=(()=>{
let api,esc,formatDate,notify,user,filters;
function configure(options){if(user?.username!==options.user.username)filters={q:'',status:'',page:1};({api,esc,formatDate,notify,user}=options);}
async function records(container,isActive){
filters=window.RecordState.read('records-pdf');let disposed=false;const live=()=>!disposed&&isActive(),get=id=>container.querySelector('#'+id),states={success:'已完成',running:'处理中',error:'失败',interrupted:'已中断'},files={available:'可下载',missing:'文件缺失',unavailable:'不可下载',pending:'等待导出'};
filters=window.RecordState.read('records-pdf');let disposed=false;const live=()=>!disposed&&isActive(),get=id=>container.querySelector('#'+id),states={success:'已完成',running:'处理中',error:'失败',interrupted:'已中断'},files={available:'可下载',missing:'文件缺失',unavailable:'不可下载',pending:'等待导出',archived:'已归档(下载时校验)'};
window.PageLifecycle?.onDispose(()=>{disposed=true;});
container.innerHTML='<div class="alert alert-warning" data-record-error hidden role="alert"></div><section class="card"><div class="card-header flex-wrap gap-3"><h2 class="card-title">PDF 导出台账</h2><div class="ms-auto d-flex gap-2"><input class="form-control" id="record-search" maxlength="200" aria-label="搜索订单" placeholder="搜索订单号、项目或型号" value="'+esc(filters.q)+'"><select class="form-select" id="record-status" aria-label="任务状态"><option value="">全部状态</option>'+Object.entries(states).map(([value,label])=>'<option value="'+value+'" '+(filters.status===value?'selected':'')+'>'+label+'</option>').join('')+'</select><button class="btn" type="button" data-record-query>查询</button></div></div><div data-pdf-list></div>'+window.RecordUi.footer+'</section><div class="small text-secondary mt-2">文件下载与存储归档分别记录 · 分类订单见 <a href="#notification-orders">通知订单</a></div>';
container.innerHTML='<div class="alert alert-warning" data-record-error hidden role="alert"></div><section class="card"><div class="card-header flex-wrap gap-3"><h2 class="card-title">PDF 导出台账</h2><div class="ms-auto d-flex gap-2"><input class="form-control" id="record-search" maxlength="200" aria-label="搜索订单" placeholder="搜索订单号、项目或型号" value="'+esc(filters.q)+'"><select class="form-select" id="record-status" aria-label="任务状态"><option value="">全部状态</option>'+Object.entries(states).map(([value,label])=>'<option value="'+value+'" '+(filters.status===value?'selected':'')+'>'+label+'</option>').join('')+'</select><button class="btn" type="button" data-record-query>查询</button></div></div><div data-pdf-list></div>'+window.RecordUi.footer+'</section><div class="small text-secondary mt-2">汇总手工导出与自动订单归档 · 归档文件下载时校验权限和内容 · 分类订单见 <a href="#notification-orders">通知订单</a></div>';
const detail=window.RecordUi.details(container,'PDF 导出详情'),archiveLabel=job=>job.archiveReceipts.some(r=>r.status==='success')?'已存储归档':job.archiveReceipts.some(r=>r.status==='running')?'归档中':job.archiveReceipts.some(r=>r.status==='error')?'归档失败':job.archiveKnown?'无归档记录':'归档状态未提供';
function open(job,button){const f=(label,value)=>window.RecordUi.field(esc,label,value);detail.show('<dl class="record-detail-grid">'+f('订单号',job.metadata?.order)+f('通知书编号',job.metadata?.serial)+f('项目',job.metadata?.project)+f('型号',job.metadata?.model)+f('导出状态',states[job.status]||job.status)+f('文件名',job.filename)+f('本地文件',files[job.fileStatus])+f('文件大小',job.fileBytes?job.fileBytes+' 字节':'—')+f('文件检查',formatDate(job.fileCheckedAt))+f('创建时间',formatDate(job.createdAt))+f('更新时间',formatDate(job.updatedAt))+f('导出来源','浏览器导出,未记录BPM连接关联')+f('错误信息',job.error)+f('存储归档',archiveLabel(job))+'</dl>'+job.archiveReceipts.map(r=>'<div class="record-receipt"><strong>'+esc(r.serverName||'存储服务器')+'</strong><div>'+esc(r.relativePath||'目录未记录')+'</div><div class="small text-secondary">'+esc(({success:'归档完成',running:'归档中',error:'归档失败'})[r.status]||r.status)+' · '+esc(formatDate(r.finishedAt))+'</div></div>').join('')+(job.downloadable?'<a class="btn btn-primary mt-3" href="/api/jobs/'+encodeURIComponent(job.jobId)+'/file">下载 PDF</a>':''),button);}
function draw(data){const host=container.querySelector('[data-pdf-list]');host.innerHTML=data.jobs.length?'<div class="table-responsive"><table class="table table-vcenter table-hover card-table record-ledger"><thead><tr><th scope="col">订单/通知书编号</th><th scope="col" class="record-node">项目/型号</th><th scope="col" class="record-export-state">导出状态</th><th scope="col" class="record-file">本地文件</th><th scope="col" class="record-source">存储归档</th><th scope="col" class="record-time">更新时间</th><th scope="col">操作</th></tr></thead><tbody>'+data.jobs.map((job,index)=>'<tr data-pdf-row><td class="record-identity"><strong>'+esc(job.metadata?.order||'订单号未记录')+'</strong><div class="small text-secondary">'+esc(job.metadata?.serial||'—')+'</div><div class="record-inline-export small">'+esc(states[job.status]||job.status)+' · '+esc(files[job.fileStatus])+'</div></td><td class="record-node">'+esc(job.metadata?.project||'—')+'<div class="small text-secondary">'+esc(job.metadata?.model||'—')+'</div></td><td class="record-export-state"><span class="badge bg-'+(job.status==='success'?'green':job.status==='running'?'blue':'red')+'-lt">'+esc(states[job.status]||job.status)+'</span></td><td class="record-file">'+esc(files[job.fileStatus]||'待检查')+'</td><td class="record-source">'+esc(archiveLabel(job))+'</td><td class="record-time small text-secondary text-nowrap">'+esc(formatDate(job.updatedAt))+'</td><td class="record-action"><div class="btn-list record-pdf-actions"><button class="btn btn-sm" type="button" data-pdf-detail="'+index+'">查看详情</button>'+(job.downloadable?'<a class="btn btn-sm" href="/api/jobs/'+encodeURIComponent(job.jobId)+'/file">下载 PDF</a>':'')+'</div></td></tr>').join('')+'</tbody></table></div>':'<div class="empty py-5"><p class="empty-title">暂无匹配的导出记录</p><p class="empty-subtitle text-secondary">可调整筛选,或从订单页面导出通知书。</p></div>';host.querySelectorAll('[data-pdf-detail]').forEach(button=>button.onclick=()=>open(data.jobs[Number(button.dataset.pdfDetail)],button));}
function open(job,button){const f=(label,value)=>window.RecordUi.field(esc,label,value);detail.show('<dl class="record-detail-grid">'+f('订单号',job.metadata?.order)+f('通知书编号',job.metadata?.serial)+f('项目',job.metadata?.project)+f('型号',job.metadata?.model)+f('导出状态',states[job.status]||job.status)+f('文件名',job.filename)+f('PDF 文件',files[job.fileStatus])+f('文件大小',job.fileBytes?job.fileBytes+' 字节':'—')+f('文件检查',formatDate(job.fileCheckedAt))+f('创建时间',formatDate(job.createdAt))+f('更新时间',formatDate(job.updatedAt))+f('导出来源',job.sourceLabel||'浏览器手工导出')+f('错误信息',job.error)+f('存储归档',archiveLabel(job))+'</dl>'+job.archiveReceipts.map(r=>'<div class="record-receipt"><strong>'+esc(r.serverName||'存储服务器')+'</strong><div>'+esc(r.relativePath||'目录未记录')+'</div><div class="small text-secondary">'+esc(({success:'归档完成',running:'归档中',error:'归档失败'})[r.status]||r.status)+' · '+esc(formatDate(r.finishedAt))+'</div></div>').join('')+(job.downloadable?'<a class="btn btn-primary mt-3" href="'+esc(job.downloadUrl||'/api/jobs/'+encodeURIComponent(job.jobId)+'/file')+'">下载 PDF</a>':''),button);}
function draw(data){const host=container.querySelector('[data-pdf-list]');host.innerHTML=data.jobs.length?'<div class="table-responsive"><table class="table table-vcenter table-hover card-table record-ledger"><thead><tr><th scope="col">订单/通知书编号</th><th scope="col" class="record-node">项目/型号</th><th scope="col" class="record-export-state">导出状态</th><th scope="col" class="record-file">PDF 文件</th><th scope="col" class="record-source">存储归档</th><th scope="col" class="record-time">更新时间</th><th scope="col">操作</th></tr></thead><tbody>'+data.jobs.map((job,index)=>'<tr data-pdf-row><td class="record-identity"><strong>'+esc(job.metadata?.order||'订单号未记录')+'</strong><div class="small text-secondary">'+esc(job.metadata?.serial||'—')+'</div><div class="small text-secondary">'+esc(job.sourceLabel||'浏览器手工导出')+'</div><div class="record-inline-export small">'+esc(states[job.status]||job.status)+' · '+esc(files[job.fileStatus])+'</div></td><td class="record-node">'+esc(job.metadata?.project||'—')+'<div class="small text-secondary">'+esc(job.metadata?.model||'—')+'</div></td><td class="record-export-state"><span class="badge bg-'+(job.status==='success'?'green':job.status==='running'?'blue':'red')+'-lt">'+esc(states[job.status]||job.status)+'</span></td><td class="record-file">'+esc(files[job.fileStatus]||'待检查')+'</td><td class="record-source">'+esc(archiveLabel(job))+'</td><td class="record-time small text-secondary text-nowrap">'+esc(formatDate(job.updatedAt))+'</td><td class="record-action"><div class="btn-list record-pdf-actions"><button class="btn btn-sm" type="button" data-pdf-detail="'+index+'">查看详情</button>'+(job.downloadable?'<a class="btn btn-sm" href="'+esc(job.downloadUrl||'/api/jobs/'+encodeURIComponent(job.jobId)+'/file')+'">下载 PDF</a>':'')+'</div></td></tr>').join('')+'</tbody></table></div>':'<div class="empty py-5"><p class="empty-title">暂无匹配的导出记录</p><p class="empty-subtitle text-secondary">可调整筛选,或从订单页面导出通知书。</p></div>';host.querySelectorAll('[data-pdf-detail]').forEach(button=>button.onclick=()=>open(data.jobs[Number(button.dataset.pdfDetail)],button));}
const table=window.RecordTable.mount({view:'records-pdf',container,isActive:live,api,onCommit:next=>{filters=next;},render:draw,readDraft:()=>({q:get('record-search').value.trim(),status:get('record-status').value}),writeDraft(next){get('record-search').value=next.q;get('record-status').value=next.status;}});await table.ready;
}
return {configure,records};