WuYongJie/furniture-3d-system-Wu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(oa-board): honor canceled returned tasks

Browse Source
This commit is contained in:
jingchuan 2026-07-17 17:14:54 +08:00
parent 83b12fc11f
commit bb3445fdd1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
furniture-3d-system/src/server/services/oa-board-sync.service.ts
View File

@ -1161,13 +1161,18 @@ function isNewerSourceTaskRow(nextRow: SourceTaskRow, currentRow: SourceTaskRow)
if (nextValue.createdAt !== currentValue.createdAt) {
return nextValue.createdAt > currentValue.createdAt
}
// 同一任务的状态变更沿用原创建时间，源表自增 ID 才能区分最新日志。
// 例如退回后写入的 CANCELED 必须覆盖此前的 RUNNING。
if (nextValue.rowId !== currentValue.rowId) {
return nextValue.rowId > currentValue.rowId
}
if (nextValue.statusPriority !== currentValue.statusPriority) {
return nextValue.statusPriority > currentValue.statusPriority
}
if (nextValue.resultPriority !== currentValue.resultPriority) {
return nextValue.resultPriority > currentValue.resultPriority
}
return nextValue.rowId > currentValue.rowId
return false
}
function buildTaskRecordsWithMappings(