修改

xuhy

2026-03-27 0923c2a6f1a7b4d28e39f566f9ff27557e2bf250

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java

@@ -140,9 +140,11 @@
        long keyCount = largeKeyGridUserService.count(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
                .eq(TLargeKeyGridUser::getUserType, 1));
        List<TLargeKeyPersonnelType> list = largeKeyPersonnelTypeService.list(Wrappers.lambdaQuery(TLargeKeyPersonnelType.class)
                .ne(TLargeKeyPersonnelType::getShowType, 1));
        int sum = list.stream().mapToInt(TLargeKeyPersonnelType::getShowNumber).sum();
        keyCount += sum;
                .eq(TLargeKeyPersonnelType::getShowType, 1));
        if(!CollectionUtils.isEmpty(list)){
            int sum = list.stream().filter(e->Objects.nonNull(e.getShowNumber())).mapToInt(TLargeKeyPersonnelType::getShowNumber).sum();
            keyCount += sum;
        }
        // 网格人数
        long gridCount = largeKeyGridUserService.count(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
                .eq(TLargeKeyGridUser::getUserType, 2));