From 10380632312a976e758189c68a165bca3c7681ce Mon Sep 17 00:00:00 2001 From: weicw1996 Date: Wed, 7 Oct 2026 13:33:07 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E4=B8=8A=E6=8A=A5=E9=97=A8?= =?UTF-8?q?=E7=A6=81=E7=9A=84=E8=8A=82=E7=82=B9=E7=BC=96=E7=A0=81=E6=AF=94?= =?UTF-8?q?=E8=BE=83=E5=BF=BD=E7=95=A5=E9=A6=96=E5=B0=BE=E7=A9=BA=E7=99=BD?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=A4=B1=E5=8E=BB=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E7=82=B9=E7=9A=84=E5=88=A4=E6=8D=AE=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExceptionDisposalServiceImpl.java | 4 ++-- .../transport/support/WaybillProcessSupport.java | 10 ---------- .../service/impl/ExceptionDisposalReportGateTest.java | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ExceptionDisposalServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ExceptionDisposalServiceImpl.java index 5086aaf5..e8842af0 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ExceptionDisposalServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ExceptionDisposalServiceImpl.java @@ -180,14 +180,14 @@ public class ExceptionDisposalServiceImpl *

* 未了结的判据与打卡门禁同一份：已完成、已撤销之外的状态都算， * 「处理中」同样占位——它只是有人跟进过，问题可能仍在。 - * 节点编码忽略大小写：历史数据里的写法不一定与过程配置的 key 完全一致。 + * 节点编码忽略大小写与首尾空白：历史数据里的写法不一定与过程配置的 key 完全一致。 */ private boolean hasUnresolvedNodeException(Long waybillId, String nodeCode) { Long count = baseMapper.selectCount(Wrappers.lambdaQuery() .eq(ExceptionDisposal::getWaybillId, waybillId) .eq(ExceptionDisposal::getIsDeleted, 0) .notIn(ExceptionDisposal::getDisposalStatus, WaybillProcessSupport.SETTLED_DISPOSAL_STATUSES) - .apply("LOWER(node_code) = {0}", nodeCode.toLowerCase(Locale.ROOT))); + .apply("LOWER(TRIM(node_code)) = {0}", nodeCode.trim().toLowerCase(Locale.ROOT))); return count != null && count > 0; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/WaybillProcessSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/WaybillProcessSupport.java index dc0649d3..7b69302b 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/WaybillProcessSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/WaybillProcessSupport.java @@ -382,16 +382,6 @@ public final class WaybillProcessSupport { return Collections.emptySet(); } - /** - * 异常处置是否已了结（已完成 / 已撤销）。 - *

- * 只有终态解除打卡门禁：「处理中」只表示有人跟进过，问题可能仍未解决，不放行。 - */ - public static boolean isSettledDisposal(String disposalStatus) { - String status = stringVal(disposalStatus); - return DISPOSAL_COMPLETED.equalsIgnoreCase(status) || DISPOSAL_REVOKED.equalsIgnoreCase(status); - } - /** * 两个节点编码是否指同一个节点：两侧去空白、忽略大小写。 *

diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalReportGateTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalReportGateTest.java index 6d0fee09..36e5c086 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalReportGateTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalReportGateTest.java @@ -177,7 +177,7 @@ class ExceptionDisposalReportGateTest { ServiceException exception = submitExpectRejected("load"); assertEquals("该节点已有未处理异常，处理完成后才能再次上报", exception.getMessage()); - assertTrue(capturedUnresolvedQuery().getTargetSql().contains("LOWER(node_code) ="), + assertTrue(capturedUnresolvedQuery().getTargetSql().contains("LOWER(TRIM(node_code)) ="), "忽略大小写要落在 SQL 上：" + capturedUnresolvedQuery().getTargetSql()); assertTrue(capturedUnresolvedParams().contains("load"), "参数取节点 key 的小写形式：" + capturedUnresolvedParams());