Skip to content

Dev - #205

Merged
xlorne merged 4 commits into
mainfrom
dev
Aug 12, 2026
Merged

Dev#205
xlorne merged 4 commits into
mainfrom
dev

Conversation

@xlorne

@xlorne xlorne commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

No description provided.

xlorne and others added 4 commits August 12, 2026 10:30
- RecordMergeStrategy 新增 MergeType(APPROVER/CREATOR/SUBMITTER)
- FlowRecord.getTodoKey() 按合并类型计算合并依据
- NodeStrategyManager.getMergeType() / BaseAuditNode 写入记录
- 持久化层 mergeType 双向转换
- 新增 FlowMergeTypeSupportTest / FlowMergeableCurrentBehaviorTest
- flow-frontend 同步合并类型选择配置(submodule → ae16159)

Co-Authored-By: Claude <noreply@anthropic.com>
- 13 个 mock/test 仓储将 cache.size()+1 改为 nextId++ 单调递增
- 与生产 JPA @GeneratedValue(IDENTITY) 语义一致
- 消除多级流程中待办/记录删除后重建时的 id 冲突(issue #202 实现中发现)

Co-Authored-By: Claude <noreply@anthropic.com>
- 新增 FlowIssue203MergeRejectTest:C 节点提交人合并,P1 被拒绝退回后重新提交,
  验证两条流程记录各自独立(P1 含拒绝记录、P2 不含),详情与节点记录展示层同样隔离
- 更新 flow-frontend 子模块指针(待办列表流程编码改为实例编码,issue #204closes #203
#204

Co-Authored-By: Claude <noreply@anthropic.com>
@xlorne
xlorne merged commit 1243dc0 into main Aug 12, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant