修改

xuhy

2026-01-07 33503867957bdcb8b3bdf1b794206078c340fdea

修改

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

@@ -139,6 +139,10 @@
        // 重点人数
        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;
        // 网格人数
        long gridCount = largeKeyGridUserService.count(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
                .eq(TLargeKeyGridUser::getUserType, 2));

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

@@ -356,36 +356,36 @@
        JSONObject result = new JSONObject();
        int i = 1;
        for (LargeKeyGridUserImport largeKeyGridUserImport : largeKeyGridUserImports) {
            if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
                result.append("第"+i+"行：[", "网格"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
                result.append("第"+i+"行：[", "小区名称"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getRegisteredResidence())){
                result.append("第"+i+"行：[", "户籍地"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
                result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
                result.append("第"+i+"行：[", "单元号"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
                result.append("第"+i+"行：[", "门牌号"+"]不能为空");
                i++;
                continue;
            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
//                result.append("第"+i+"行：[", "网格"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
//                result.append("第"+i+"行：[", "小区名称"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getRegisteredResidence())){
//                result.append("第"+i+"行：[", "户籍地"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
//                result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
//                result.append("第"+i+"行：[", "单元号"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
//                result.append("第"+i+"行：[", "门牌号"+"]不能为空");
//                i++;
//                continue;
//            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUserName())){
                result.append("第"+i+"行：[", "姓名"+"]不能为空");
                i++;
@@ -436,21 +436,23 @@
                TLargeKeyPersonnelType largeKeyPersonnelType = largeKeyPersonnelTypeService.getOne(Wrappers.lambdaQuery(TLargeKeyPersonnelType.class)
                        .eq(TLargeKeyPersonnelType::getTypeName, largeKeyGridUserImport.getTypeName())
                        .last("LIMIT 1"));
                if(Objects.isNull(largeKeyPersonnelType)){
                    result.append("第"+i+"行：[", "类型名称"+"]不存在");
                    i++;
                    continue;
//                if(Objects.isNull(largeKeyPersonnelType)){
//                    result.append("第"+i+"行：[", "类型名称"+"]不存在");
//                    i++;
//                    continue;
//                }
                if(Objects.nonNull(largeKeyPersonnelType)){
                    largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());
                }
                largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());
            }
            largeKeyGridUser.setUserType(2);
            largeKeyGridUsers.add(largeKeyGridUser);
            i++;
        }
        largeKeyGridUserService.saveBatch(largeKeyGridUsers);
        if(!result.isEmpty()){
            return R.fail(result.toString());
        }
        largeKeyGridUserService.saveBatch(largeKeyGridUsers);
        return R.ok();
    }