Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.codingapi.flow.action;

import com.codingapi.flow.common.IMapConvertor;
import com.codingapi.flow.event.FlowRecordDoneEvent;
import com.codingapi.flow.event.FlowRecordTodoEvent;
import com.codingapi.flow.event.IFlowEvent;
import com.codingapi.flow.node.IFlowNode;
Expand Down Expand Up @@ -120,6 +121,42 @@ protected boolean isEndNodeTodoEvent(IFlowEvent event) {
&& !todoEvent.getFlowRecord().isNotEndNode();
}

/**
* 将当前节点实例中其他未办理的待办记录自动办结。
*
* <p>退回({@link com.codingapi.flow.action.actions.ReturnAction})、拒绝
* ({@link com.codingapi.flow.action.actions.RejectAction})意味着当前节点就此结束,
* 同节点其他审批人(或签/并签的候选审批人)的待办不能继续办理:否则会遗留待办,
* 流程视图仍停留在当前节点,发起人重新提交后还会出现同流程的重复待办(issue #235 / #255)。
*
* <p>自动办结采用 {@link FlowRecord#autoDone()}:记录置为已办但不带审批动作,
* 展示层标记为「自动跳过」,与或签/并签节点完成后遗留待办的处理口径一致。
* 仅处理同一流程实例内的记录,避免仓储按 {@code (fromId, nodeId)} 查询时误伤其他流程实例。
*
* @param flowSession 当前会话,同节点记录取自 {@link FlowSession#getCurrentNodeRecords()}
* @param recordList 待保存的记录集合,自动办结的记录会追加其中
* @param flowEvents 待推送的事件集合,每条自动办结记录都会追加一条已办事件
*/
protected void autoDoneSiblingTodos(FlowSession flowSession,
List<FlowRecord> recordList,
List<IFlowEvent> flowEvents) {
FlowRecord currentRecord = flowSession.getCurrentRecord();
for (FlowRecord record : flowSession.getCurrentNodeRecords()) {
if (record.getId() == currentRecord.getId()) {
continue;
}
if (!record.isTodo()) {
continue;
}
if (!currentRecord.getProcessId().equals(record.getProcessId())) {
continue;
}
record.autoDone();
recordList.add(record);
flowEvents.add(new FlowRecordDoneEvent(record, flowSession.isMock()));
}
}

/**
* 触发并执行后续节点
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,7 @@ public void run(FlowSession flowSession) {

// 拒绝即结束当前节点:将同节点其他未办理的待办(或签/并签的其他审批人)自动置为已办。
// 否则节点被退回后仍会遗留待办,审批人可继续办理,流程视图也会停留在当前节点(issue #235)。
for (FlowRecord record : flowSession.getCurrentNodeRecords()) {
if (record.getId() != flowRecord.getId() && record.isTodo()) {
record.autoDone();
recordList.add(record);
flowEvents.add(new FlowRecordDoneEvent(record, flowSession.isMock()));
}
}
this.autoDoneSiblingTodos(flowSession, recordList, flowEvents);

// 先保存当前记录及同节点待办的自动办结状态,再触发退回/终止节点。
// 终止流程时 EndNode.fillNewRecord 会按数据库中的最新记录统一置为结束状态,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ public void run(FlowSession flowSession) {

flowEvents.add(new FlowRecordDoneEvent(currentRecord,flowSession.isMock()));

// 退回即结束当前节点:同节点其他未办理的待办(或签/并签的其他审批人)一并自动置为已办。
// 否则退回后仍会遗留待办,发起人重新提交到该节点时会出现同流程的重复待办(issue #255)。
this.autoDoneSiblingTodos(flowSession, recordList, flowEvents);

// 先保存当前记录与同节点待办的自动办结状态,再生成退回目标节点的记录,
// 与拒绝动作一致,避免退回目标节点的生成过程覆盖本会话中的记录状态(issue #235)
repositoryHolder.saveRecords(recordList);
recordList.clear();

List<FlowRecord> flowRecords = backNode.generateCurrentRecords(flowSession.updateSession(backNode));
recordList.addAll(flowRecords);

Expand Down
Loading
Loading