From 077848a0f68583677988d24fb63769dbfa633504 Mon Sep 17 00:00:00 2001 From: weicw <594098497@qq.com> Date: Wed, 28 Oct 2026 18:48:31 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E9=A6=96=E9=A1=B5=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=BD=AE=E7=BA=A2=E7=82=B9=E5=8F=AA=E6=95=B0=E5=BE=85?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 快捷入口红点由 disposalStatus≠completed 改为 =pending，处置中的不再计入待办 - 补充 ManageAdminHomeBadgeTest --- .../transport/pojo/vo/AdminHomeBadgesVO.java | 2 +- .../impl/ManageWaybillServiceImpl.java | 11 +- .../impl/ManageAdminHomeBadgeTest.java | 137 ++++++++++++++++++ 3 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageAdminHomeBadgeTest.java diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminHomeBadgesVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminHomeBadgesVO.java index bb6081fb..8b8bf43a 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminHomeBadgesVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminHomeBadgesVO.java @@ -38,7 +38,7 @@ public class AdminHomeBadgesVO implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Schema(description = "异常处置待办数（disposalStatus≠completed）") + @Schema(description = "异常处置待办数（disposalStatus=pending）") private long exception; @Schema(description = "风险记录待办数（disposalStatus=pending）") diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java index 4fb4c83e..8ff20200 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java @@ -170,7 +170,8 @@ public class ManageWaybillServiceImpl implements IManageWaybillService { home.setStats(stats()); AdminHomeBadgesVO badges = new AdminHomeBadgesVO(); - badges.setException(home.getStats().getException()); + // 快捷入口的红点是待办数，只数待处理：处置中的已经在跟，不再提醒 + badges.setException(countPendingExceptions()); badges.setRisk(countPendingRisks()); badges.setPendingReassign(countPendingReassignments()); home.setBadges(badges); @@ -1213,6 +1214,14 @@ public class ManageWaybillServiceImpl implements IManageWaybillService { return exceptionDisposalService.count(wrapper); } + /** 快捷入口「异常处置」红点：只数待处理（pending），处置中已不算待办 */ + private long countPendingExceptions() { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .eq(ExceptionDisposal::getDisposalStatus, DISPOSAL_PENDING); + applyExceptionDeptScope(wrapper); + return exceptionDisposalService.count(wrapper); + } + private long countPendingRisks() { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() .eq(RiskDisposal::getDisposalStatus, RISK_PENDING); diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageAdminHomeBadgeTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageAdminHomeBadgeTest.java new file mode 100644 index 00000000..1eeb83a9 --- /dev/null +++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageAdminHomeBadgeTest.java @@ -0,0 +1,137 @@ +package org.springblade.transport.service.impl; + +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.core.conditions.AbstractWrapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; +import org.apache.ibatis.builder.MapperBuilderAssistant; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatchers; +import org.mockito.MockedStatic; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.system.cache.UserDisplayCache; +import org.springblade.transport.pojo.entity.ExceptionDisposal; +import org.springblade.transport.pojo.entity.Waybill; +import org.springblade.transport.pojo.vo.AdminHomeVO; +import org.springblade.transport.pojo.vo.TripTabCountsVO; +import org.springblade.transport.service.IDriverService; +import org.springblade.transport.service.IDriverWaybillService; +import org.springblade.transport.service.IExceptionDisposalService; +import org.springblade.transport.service.ILoadingManageService; +import org.springblade.transport.service.IRiskDisposalService; +import org.springblade.transport.service.ITripQueryService; +import org.springblade.transport.service.IWaybillService; +import org.springblade.transport.support.MpUserDataScopeSupport; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * 调度端首页「异常处置」快捷入口的红点：只数待处理（pending）的异常。 + *

+ * 统计卡的「在途异常」仍按未了结（pending + processing）算，两处口径不同：红点是待办提醒， + * 处置中的异常已经在跟进，再算进红点会让它一直清不掉。 + *

+ * 这里走 {@code home()}：红点是聚合接口里的字段，只测计数方法证明不了它接在哪一处。 + */ +class ManageAdminHomeBadgeTest { + + private static final String DEPT_ID = "1123598813738675201"; + private static final Long USER_ID = 1900000000000000001L; + private static final long PENDING_COUNT = 3L; + private static final long INCOMPLETE_COUNT = 7L; + + private ManageWaybillServiceImpl service; + private IExceptionDisposalService exceptionService; + private MockedStatic authUtil; + + @BeforeAll + static void initTableInfo() { + MybatisConfiguration configuration = new MybatisConfiguration(); + MapperBuilderAssistant assistant = new MapperBuilderAssistant(configuration, ""); + assistant.setCurrentNamespace("test"); + TableInfoHelper.initTableInfo(assistant, Waybill.class); + TableInfoHelper.initTableInfo(assistant, ExceptionDisposal.class); + } + + @BeforeEach + void setUp() { + IWaybillService waybillService = mock(IWaybillService.class); + exceptionService = mock(IExceptionDisposalService.class); + ITripQueryService tripQueryService = mock(ITripQueryService.class); + when(tripQueryService.tabCounts(ArgumentMatchers.any())).thenReturn(new TripTabCountsVO()); + when(exceptionService.list(ArgumentMatchers.>any())) + .thenReturn(new ArrayList<>()); + when(waybillService.list(ArgumentMatchers.>any())).thenReturn(new ArrayList<>()); + // 待重新派单的分页查询回它收到的 Page（总数从入参上读，回 null 会空指针） + when(waybillService.page(ArgumentMatchers.any(), ArgumentMatchers.any())) + .thenAnswer(invocation -> invocation.getArgument(0)); + // 处置状态的计数被查两次：带 processing 的是「未了结」，只带 pending 的是「待处理」 + when(exceptionService.count(ArgumentMatchers.>any())) + .thenAnswer(invocation -> coversProcessing(invocation.getArgument(0)) ? INCOMPLETE_COUNT : PENDING_COUNT); + service = new ManageWaybillServiceImpl( + waybillService, + mock(IDriverService.class), + exceptionService, + mock(IRiskDisposalService.class), + mock(IDriverWaybillService.class), + tripQueryService, + mock(ILoadingManageService.class), + mock(MpUserDataScopeSupport.class)); + authUtil = mockStatic(AuthUtil.class); + authUtil.when(AuthUtil::getUserRole).thenReturn("yewu"); + authUtil.when(AuthUtil::getDeptId).thenReturn(DEPT_ID); + authUtil.when(AuthUtil::getUserId).thenReturn(USER_ID); + } + + @AfterEach + void tearDown() { + authUtil.close(); + } + + @Test + @DisplayName("红点只数待处理，统计卡的在途异常仍是未了结数") + void exceptionBadgeCountsPendingOnly() { + AdminHomeVO home; + try (MockedStatic ignored = mockStatic(UserDisplayCache.class)) { + home = service.home(); + } + + assertEquals(PENDING_COUNT, home.getBadges().getException(), "处置中的异常不再计入红点"); + assertEquals(INCOMPLETE_COUNT, home.getStats().getException(), "统计卡口径不变：pending + processing"); + + ArgumentCaptor> captor = ArgumentCaptor.forClass(Wrapper.class); + verify(exceptionService, times(2)).count(captor.capture()); + List segments = captor.getAllValues().stream() + .map(ManageAdminHomeBadgeTest::sqlSegment) + .collect(Collectors.toList()); + assertTrue(segments.stream().anyMatch(segment -> segment.contains("disposal_status IN")), + "统计卡仍要数未了结：处置状态取 pending 与 processing 两档：" + segments); + assertTrue(segments.stream().anyMatch(segment -> segment.contains("disposal_status = ")), + "红点只认待处理：处置状态是等值条件，不再带 processing：" + segments); + } + + /** 计数条件里是否含处置中：带 IN 的才是「pending + processing」那次查询 */ + private static boolean coversProcessing(Wrapper wrapper) { + return sqlSegment(wrapper).contains("disposal_status IN"); + } + + private static String sqlSegment(Wrapper wrapper) { + return ((AbstractWrapper) wrapper).getSqlSegment(); + } + +}