From b31b81bedf84a03fe75af28ef0cd1924c8a3e110 Mon Sep 17 00:00:00 2001 From: weicw1996 Date: Thu, 22 Oct 2026 15:30:26 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E6=AD=A3=E5=BE=85=E5=9B=9E?= =?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E5=8D=95=E6=B5=8B=E7=9A=84=E6=A1=A9?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B=E4=B8=8E=E5=A4=B9=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DriverWaybillAutoCompleteTest.java | 9 ++++++++- .../service/impl/DriverWaybillTabStatusTest.java | 13 ++++++++++++- .../impl/WaybillEditSaveBusinessStatusTest.java | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java index 3c1f83fe..6a23c1ac 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java @@ -72,6 +72,13 @@ class DriverWaybillAutoCompleteTest { {"key":"return","name":"回单","type":"confirm","enabled":true,"punch":true,"confirmMode":"yes"}] """; + /** 装货 → 签收两个司机打卡节点，末位是签收，回单需确认完成 */ + private static final String LOAD_SIGN_RETURN_CONFIRM_JSON = """ + [{"key":"load","name":"装货","type":"cargo","enabled":true,"punch":true}, + {"key":"sign","name":"签收","type":"cargo","enabled":true,"punch":true}, + {"key":"return","name":"回单","type":"confirm","enabled":true,"punch":true,"confirmMode":"yes"}] + """; + /** 末位打卡节点是「发货」，不是到货/卸货/签收 */ private static final String DISPATCH_LAST_JSON = """ [{"key":"dispatch","name":"发货","type":"cargo","enabled":true,"punch":true}] @@ -190,7 +197,7 @@ class DriverWaybillAutoCompleteTest { @Test @DisplayName("回单需确认但不是末位打卡：运单留在进行中") void nonLastPunchDoesNotEnterReturnConfirmation() { - givenWaybill(SIGN_LAST_RETURN_CONFIRM_JSON, "running"); + givenWaybill(LOAD_SIGN_RETURN_CONFIRM_JSON, "running"); DriverNodePunchVO vo = submit("load"); diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java index 5de8ac1d..668dc965 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java @@ -152,7 +152,18 @@ class DriverWaybillTabStatusTest { @SuppressWarnings("unchecked") private Collection queriedStatuses() { assertEquals(1, queried.size(), "一次列表查询"); - return ((LambdaQueryWrapper) queried.get(0)).getParamNameValuePairs().values(); + LambdaQueryWrapper wrapper = (LambdaQueryWrapper) queried.get(0); + // 参数槽由 SQL 片段构建时填充：不先取一次片段，参数表是空的 + wrapper.getSqlSegment(); + Collection statuses = new ArrayList<>(); + wrapper.getParamNameValuePairs().values().forEach(value -> { + if (value instanceof Collection items) { + statuses.addAll(items); + } else { + statuses.add(value); + } + }); + return statuses; } @SuppressWarnings("unchecked") diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/WaybillEditSaveBusinessStatusTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/WaybillEditSaveBusinessStatusTest.java index 626d8886..db84583a 100644 --- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/WaybillEditSaveBusinessStatusTest.java +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/WaybillEditSaveBusinessStatusTest.java @@ -175,7 +175,7 @@ class WaybillEditSaveBusinessStatusTest { when(waybillMapper.selectById(WAYBILL_ID)).thenReturn(oldRecord); try (MockedStatic authUtil = mockStatic(AuthUtil.class)) { - authUtil.when(AuthUtil::getDeptId).thenReturn(DEPT_ID); + authUtil.when(AuthUtil::getDeptId).thenReturn(String.valueOf(DEPT_ID)); assertTrue(service.submit(request)); } }