diff --git a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ApprovalController.java b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ApprovalController.java index 62ba2d2..f0a012d 100644 --- a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ApprovalController.java +++ b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/web/ApprovalController.java @@ -319,7 +319,7 @@ public class ApprovalController { private ResponseEntity> approve(String taskId, GatewayRequests.ApprovalActionRequest req) { Map vars = new LinkedHashMap<>(); vars.put("approveResult", "agree"); - flowableClient.complete(taskId, vars, req.comment); + flowableClient.complete(taskId, vars, agreeComment(req.comment)); boolean ended = isProcessEnded(req.processInstanceId); String table = resolveTable(req.tableName, req.businessKey); @@ -332,6 +332,19 @@ public class ApprovalController { return ResponseEntity.ok(r); } + /** + * 「同意」审批意见归一:保证以「同意」开头,对齐老系统并使报表审批段可见 + * (报表 SQL 按 {@code message_ LIKE '同意%'} 匹配、{@code regexp_replace(message_,'^同意:|^同意','')} 取意见)。 + * 空意见 → {@code "同意"};已以「同意」开头 → 原样;否则 → {@code "同意:" + 意见}。 + */ + static String agreeComment(String opinion) { + String s = opinion == null ? "" : opinion.trim(); + if (s.isEmpty()) { + return "同意"; + } + return s.startsWith("同意") ? s : "同意:" + s; + } + /** 拒绝:终止流程(引擎 deleteProcessInstance)+回写 SYS_DATASTATUS=4(驳回)。 */ private ResponseEntity> reject(String taskId, GatewayRequests.ApprovalActionRequest req) { Map engine = flowableClient.reject(taskId, req.comment); diff --git a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ApprovalControllerActionTest.java b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ApprovalControllerActionTest.java index 6f93f2b..2fe0c5c 100644 --- a/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ApprovalControllerActionTest.java +++ b/platform-flow-gateway/src/test/java/com/eip4/platform/flowgateway/ApprovalControllerActionTest.java @@ -1,6 +1,8 @@ package com.eip4.platform.flowgateway; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; @@ -92,6 +94,33 @@ class ApprovalControllerActionTest { verify(flowableClient).assist("t3", List.of("u-a", "u-z"), null); } + /** + * 同意意见落 act_hi_comment 必须以「同意」开头——报表审批段按 {@code message LIKE '同意%'} 匹配 + * 并 {@code regexp_replace} 去前缀取意见。空意见 → 默认「同意」(修审批意见在报表不显示=原因B go-forward)。 + */ + @Test + void approve_blankComment_recordsDefault同意() { + ResponseEntity> resp = controller.action("t1", req("approve")); + assertThat(resp.getStatusCode().is2xxSuccessful()).isTrue(); + verify(flowableClient).complete(eq("t1"), any(), eq("同意")); + } + + @Test + void approve_withOpinion_prefixesWith同意() { + GatewayRequests.ApprovalActionRequest r = req("approve"); + r.comment = "已审核无误"; + controller.action("t2", r); + verify(flowableClient).complete(eq("t2"), any(), eq("同意:已审核无误")); + } + + @Test + void approve_opinionAlreadyStartsWith同意_keptAsIs() { + GatewayRequests.ApprovalActionRequest r = req("approve"); + r.comment = "同意,按计划执行"; + controller.action("t3", r); + verify(flowableClient).complete(eq("t3"), any(), eq("同意,按计划执行")); + } + @Test void assist_withoutTargets_returns400() { ResponseEntity> resp = controller.action("t4", req("assist"));