feat(approval): 审批闭环 P0/流程图/会签 — 协办转阅+BPMN图+scriptUser会签
承接 WfTemplate 数据驱动审批主链路(approve/reject/reback/agent 已 live),补齐缺口:
P0 协办(assist)/转阅(circulated):
- flowable-service 新增 POST /tasks/{id}/assist、/circulate(对齐老 ProcessCoreServiceImpl
createSubTask/createNewTask:每人建独立任务,父任务记意见,不阻断主流程)
- gateway FlowableClient.assist/circulate + ApprovalController 把 assist/circulated 从 400 改真实分派
- 前端 ApprovalDrawer 多选人弹窗 MultiUserForm
- 对抗审查修复:独立任务沿 parentTaskId 回溯父任务取 businessKey/formKey(否则协办/转阅人
看不到业务单据,且 processInstanceId(null) 崩 500);assist 父任务 404 守卫;MAX_FANOUT=50;
@Transactional;转阅改 setFormKey 而非 description
P1 BPMN 流程图查看:
- flowable-service 新 ProcessDiagramController GET /process/{pi}/diagram
(bpmnXml + 当前/历史活动节点,运行/历史双路取 procDefId,只读)
- gateway FlowableClient.diagram + TodoController 转发
- 前端 bpmn-js 渲染(中文走浏览器字体,当前节点绿/已走过灰),ApprovalDrawer 按需展开
P3 会签(BPMN 多实例):移植 CandidateUsersHandler 的 scriptUser(JUEL)候选人解析分支
(原"精简边界"WARN 降级,致招投标/总包合同/施工技术交底等用 ${APPLYUSERS} 的会签节点被跳过):
单变量直读流程变量 + 复杂表达式回退 flowable 表达式管理器 + 结果归一为去重 userId 列表
测试:flowable-service 56 + gateway 全模块 全绿;前端 tsc 干净 + vitest 83/83 + build。
live e2e(真 eip4flow):协办/转阅各 count:1 且子任务回溯出 businessKey/进目标用户待办;
流程图真 DI 实例渲染;会签起 3 并行任务/全票聚合推进。
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -170,6 +170,36 @@ public class FlowableClient {
|
||||
Map.of("delegateUserId", delegateUserId), Void.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* 协办(加签):为每个 userId 建一条子任务。对应 flowable-service
|
||||
* {@code POST /api/flow/tasks/{taskId}/assist}。
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public Map<String, Object> assist(String taskId, List<String> userIds, String comment) {
|
||||
return post("协办", "/api/flow/tasks/" + taskId + "/assist",
|
||||
actionBody(userIds, comment), Map.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* 转阅(抄送):为每个 userId 建一条只读转阅任务。对应 flowable-service
|
||||
* {@code POST /api/flow/tasks/{taskId}/circulate}。
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public Map<String, Object> circulate(String taskId, List<String> userIds, String comment) {
|
||||
return post("转阅", "/api/flow/tasks/" + taskId + "/circulate",
|
||||
actionBody(userIds, comment), Map.class);
|
||||
}
|
||||
|
||||
/** 协办/转阅请求体:targetUserIds(必) + comment(可空)。 */
|
||||
private static Map<String, Object> actionBody(List<String> userIds, String comment) {
|
||||
Map<String, Object> body = new java.util.LinkedHashMap<>();
|
||||
body.put("targetUserIds", userIds == null ? List.of() : userIds);
|
||||
if (comment != null && !comment.isBlank()) {
|
||||
body.put("comment", comment);
|
||||
}
|
||||
return body;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查流程实例(供办理后判定是否结束以回写业务状态)。
|
||||
* 实例不存在(404)返回 null;运行中 {@code ended=false},已结束 {@code ended=true}。
|
||||
@@ -184,6 +214,18 @@ public class FlowableClient {
|
||||
.body(ProcessInstanceDto.class));
|
||||
}
|
||||
|
||||
/**
|
||||
* 流程图数据(BPMN XML + 当前/历史节点)。对应 flowable-service
|
||||
* {@code GET /api/flow/process/{processInstanceId}/diagram}。供前端 bpmn-js 渲染高亮。
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public Map<String, Object> diagram(String processInstanceId) {
|
||||
return execute("流程图", () -> restClient.get()
|
||||
.uri("/api/flow/process/{id}/diagram", processInstanceId)
|
||||
.retrieve()
|
||||
.body(Map.class));
|
||||
}
|
||||
|
||||
/** 按发起人查询历史流程实例。对应 flowable-service {@code GET /api/flow/process/started}。 */
|
||||
public List<ProcessInstanceDto> started(String startedBy, int firstResult, int maxResults) {
|
||||
return execute("发起流程列表", () -> restClient.get()
|
||||
|
||||
@@ -203,7 +203,8 @@ public class ApprovalController {
|
||||
|
||||
@Operation(summary = "审批动作分派(按 WfTemplate 按钮 type)",
|
||||
description = "approve=complete+回写 SYS_DATASTATUS(结束 3/未结束 2);reject=终止流程+回写 4;"
|
||||
+ "reback=退回发起+回写 5;agent=委托给 targetUserId。协办/转阅暂未实现(返回 400)。")
|
||||
+ "reback=退回发起+回写 5;agent=委托给 targetUserId;assist=协办(为 targetUserIds 各建子任务);"
|
||||
+ "circulated=转阅(为 targetUserIds 各建只读转阅任务)。")
|
||||
@PostMapping("/api/task/{taskId}/action")
|
||||
public ResponseEntity<Map<String, Object>> action(@PathVariable String taskId,
|
||||
@RequestBody GatewayRequests.ApprovalActionRequest req) {
|
||||
@@ -224,7 +225,8 @@ public class ApprovalController {
|
||||
case "reject" -> reject(taskId, req);
|
||||
case "reback" -> reback(taskId, req);
|
||||
case "agent" -> agent(taskId, req);
|
||||
case "assist", "circulated" -> badRequest("暂不支持「" + labelOf(type) + "」,请用转办(agent)");
|
||||
case "assist" -> assist(taskId, req);
|
||||
case "circulated" -> circulate(taskId, req);
|
||||
default -> badRequest("未知审批动作: " + type);
|
||||
};
|
||||
}
|
||||
@@ -364,6 +366,50 @@ public class ApprovalController {
|
||||
return ResponseEntity.ok(r);
|
||||
}
|
||||
|
||||
/** 协办(加签):为每个目标用户建一条子任务(引擎 createSubTask),不阻断主任务。 */
|
||||
private ResponseEntity<Map<String, Object>> assist(String taskId, GatewayRequests.ApprovalActionRequest req) {
|
||||
List<String> users = targetUsers(req);
|
||||
if (users.isEmpty()) {
|
||||
return badRequest("协办需指定 targetUserIds");
|
||||
}
|
||||
Map<String, Object> engine = flowableClient.assist(taskId, users, req.comment);
|
||||
Map<String, Object> r = ok("assist");
|
||||
r.put("assisted", true);
|
||||
r.put("count", engine != null ? engine.get("count") : users.size());
|
||||
r.put("targetUserIds", users);
|
||||
return ResponseEntity.ok(r);
|
||||
}
|
||||
|
||||
/** 转阅(抄送):为每个目标用户建一条只读转阅任务(引擎 createNewTask),不推进主流程。 */
|
||||
private ResponseEntity<Map<String, Object>> circulate(String taskId, GatewayRequests.ApprovalActionRequest req) {
|
||||
List<String> users = targetUsers(req);
|
||||
if (users.isEmpty()) {
|
||||
return badRequest("转阅需指定 targetUserIds");
|
||||
}
|
||||
Map<String, Object> engine = flowableClient.circulate(taskId, users, req.comment);
|
||||
Map<String, Object> r = ok("circulated");
|
||||
r.put("circulated", true);
|
||||
r.put("count", engine != null ? engine.get("count") : users.size());
|
||||
r.put("targetUserIds", users);
|
||||
return ResponseEntity.ok(r);
|
||||
}
|
||||
|
||||
/** 协办/转阅目标用户:优先 targetUserIds 列表,回退单个 targetUserId;去空白去重。 */
|
||||
private static List<String> targetUsers(GatewayRequests.ApprovalActionRequest req) {
|
||||
java.util.LinkedHashSet<String> set = new java.util.LinkedHashSet<>();
|
||||
if (req.targetUserIds != null) {
|
||||
for (String u : req.targetUserIds) {
|
||||
if (u != null && !u.isBlank()) {
|
||||
set.add(u.trim());
|
||||
}
|
||||
}
|
||||
}
|
||||
if (req.targetUserId != null && !req.targetUserId.isBlank()) {
|
||||
set.add(req.targetUserId.trim());
|
||||
}
|
||||
return new ArrayList<>(set);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 小工具
|
||||
|
||||
/** 直接回写业务状态(reject/reback 是显式终态转移,不走单调守卫)。businessKey 空则不写。 */
|
||||
@@ -476,8 +522,4 @@ public class ApprovalController {
|
||||
Object v = m == null ? null : m.get(key);
|
||||
return v == null ? null : String.valueOf(v);
|
||||
}
|
||||
|
||||
private static String labelOf(String type) {
|
||||
return "assist".equals(type) ? "协办" : "转阅";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,8 +50,10 @@ public final class GatewayRequests {
|
||||
/** WfTemplate 按钮 id:服务器侧据此重解析该按钮的 servicename(自定义服务流)并执行,不信前端直传服务名。 */
|
||||
public String buttonId;
|
||||
public String comment;
|
||||
/** 转办/协办/转阅的目标用户。 */
|
||||
/** 转办的目标用户(单人)。 */
|
||||
public String targetUserId;
|
||||
/** 协办/转阅的目标用户(多人,老系统用 MultiSelectField 选多人,各建一条子/转阅任务)。 */
|
||||
public java.util.List<String> targetUserIds;
|
||||
public String businessKey;
|
||||
public String processInstanceId;
|
||||
public String tableName;
|
||||
|
||||
@@ -359,6 +359,12 @@ public class TodoController {
|
||||
return ResponseEntity.ok(nodes);
|
||||
}
|
||||
|
||||
@Operation(summary = "流程图(BPMN)", description = "透传 flowable-service:返回流程定义 BPMN XML + 当前/历史活动节点,供前端 bpmn-js 渲染并高亮当前停留节点")
|
||||
@GetMapping("/api/workflow/process/{processInstanceId}/diagram")
|
||||
public ResponseEntity<Map<String, Object>> diagram(@PathVariable String processInstanceId) {
|
||||
return ResponseEntity.ok(flowableClient.diagram(processInstanceId));
|
||||
}
|
||||
|
||||
@Operation(summary = "委托任务", description = "将任务委托给指定用户(delegateUserId),assignee 变受托人,owner 记原办理人")
|
||||
@PostMapping("/api/task/{id}/delegate")
|
||||
public ResponseEntity<Map<String, Object>> delegate(@PathVariable String id,
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
package com.eip4.platform.flowgateway;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.verifyNoInteractions;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
|
||||
import com.dsasp.server.common.core.service.FlowExcuteService;
|
||||
import com.eip4.platform.flowgateway.aggregate.BusinessRecordLoader;
|
||||
import com.eip4.platform.flowgateway.aggregate.BusinessSummaryService;
|
||||
import com.eip4.platform.flowgateway.aggregate.WfTemplateService;
|
||||
import com.eip4.platform.flowgateway.client.FlowableClient;
|
||||
import com.eip4.platform.flowgateway.web.ApprovalController;
|
||||
import com.eip4.platform.flowgateway.web.GatewayRequests;
|
||||
import com.eip4.platform.flowgateway.writeback.StatusWriteback;
|
||||
import com.eip4.platform.metadata.flow.UserColumnResolver;
|
||||
|
||||
/**
|
||||
* 审批动作分派单测:聚焦协办(assist)/转阅(circulated)新接线——按 type 转调 FlowableClient,
|
||||
* targetUserIds 列表归一(去空白去重、回退单值),无目标用户 → 400。
|
||||
*/
|
||||
class ApprovalControllerActionTest {
|
||||
|
||||
private final FlowableClient flowableClient = mock(FlowableClient.class);
|
||||
private final WfTemplateService wfTemplateService = mock(WfTemplateService.class);
|
||||
private final BusinessSummaryService businessSummaryService = mock(BusinessSummaryService.class);
|
||||
private final StatusWriteback statusWriteback = mock(StatusWriteback.class);
|
||||
private final FlowExcuteService flowExcuteService = mock(FlowExcuteService.class);
|
||||
private final BusinessRecordLoader businessRecordLoader = mock(BusinessRecordLoader.class);
|
||||
private final UserColumnResolver userColumnResolver = mock(UserColumnResolver.class);
|
||||
private final ApprovalController controller = new ApprovalController(flowableClient, wfTemplateService,
|
||||
businessSummaryService, statusWriteback, flowExcuteService, businessRecordLoader, userColumnResolver);
|
||||
|
||||
private GatewayRequests.ApprovalActionRequest req(String type) {
|
||||
GatewayRequests.ApprovalActionRequest r = new GatewayRequests.ApprovalActionRequest();
|
||||
r.actionType = type;
|
||||
return r;
|
||||
}
|
||||
|
||||
@Test
|
||||
void assist_buildsSubTasksForEachUser() {
|
||||
GatewayRequests.ApprovalActionRequest r = req("assist");
|
||||
r.targetUserIds = List.of("u-a", "u-b");
|
||||
r.comment = "请协助";
|
||||
when(flowableClient.assist("t1", List.of("u-a", "u-b"), "请协助"))
|
||||
.thenReturn(Map.of("count", 2));
|
||||
|
||||
ResponseEntity<Map<String, Object>> resp = controller.action("t1", r);
|
||||
|
||||
assertThat(resp.getStatusCode().is2xxSuccessful()).isTrue();
|
||||
assertThat(resp.getBody()).containsEntry("action", "assist")
|
||||
.containsEntry("assisted", true)
|
||||
.containsEntry("count", 2);
|
||||
verify(flowableClient).assist("t1", List.of("u-a", "u-b"), "请协助");
|
||||
}
|
||||
|
||||
@Test
|
||||
void circulated_buildsReadonlyTasksForEachUser() {
|
||||
GatewayRequests.ApprovalActionRequest r = req("circulated");
|
||||
r.targetUserIds = List.of("u-c");
|
||||
when(flowableClient.circulate("t2", List.of("u-c"), null))
|
||||
.thenReturn(Map.of("count", 1));
|
||||
|
||||
ResponseEntity<Map<String, Object>> resp = controller.action("t2", r);
|
||||
|
||||
assertThat(resp.getStatusCode().is2xxSuccessful()).isTrue();
|
||||
assertThat(resp.getBody()).containsEntry("action", "circulated")
|
||||
.containsEntry("circulated", true)
|
||||
.containsEntry("count", 1);
|
||||
verify(flowableClient).circulate("t2", List.of("u-c"), null);
|
||||
}
|
||||
|
||||
@Test
|
||||
void assist_dedupesAndFallsBackToSingleTargetUserId() {
|
||||
GatewayRequests.ApprovalActionRequest r = req("assist");
|
||||
r.targetUserIds = List.of(" u-a ", "u-a"); // 去空白后重复
|
||||
r.targetUserId = "u-z"; // 单值并入
|
||||
when(flowableClient.assist("t3", List.of("u-a", "u-z"), null))
|
||||
.thenReturn(Map.of("count", 2));
|
||||
|
||||
ResponseEntity<Map<String, Object>> resp = controller.action("t3", r);
|
||||
|
||||
assertThat(resp.getStatusCode().is2xxSuccessful()).isTrue();
|
||||
verify(flowableClient).assist("t3", List.of("u-a", "u-z"), null);
|
||||
}
|
||||
|
||||
@Test
|
||||
void assist_withoutTargets_returns400() {
|
||||
ResponseEntity<Map<String, Object>> resp = controller.action("t4", req("assist"));
|
||||
assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
|
||||
verifyNoInteractions(flowableClient);
|
||||
}
|
||||
|
||||
@Test
|
||||
void circulated_withoutTargets_returns400() {
|
||||
ResponseEntity<Map<String, Object>> resp = controller.action("t5", req("circulated"));
|
||||
assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
|
||||
verifyNoInteractions(flowableClient);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user