xuhy
2025-03-13 8d9596f650523d8b6981657bd26078cb1ec09885
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
@@ -355,22 +355,6 @@
        ClassPathResource classPathResource = new ClassPathResource("template/销售数据列表.xls");
        TemplateExportParams params = new TemplateExportParams(classPathResource.getPath());
        Workbook workbook = ExcelExportUtil.exportExcel(params, result);
        Sheet firstSheet = workbook.getSheetAt(0);
//        List<CellRangeAddress> mergedRegions = firstSheet.getMergedRegions();
//        List<Integer> removeMergedRegionIndexList = new ArrayList<>();
        // 处理数据不显示
//        for (int i = 0; i < mergedRegions.size(); i++) {
//            CellRangeAddress mergedRegion = mergedRegions.get(i);
//            int firstColumn = mergedRegion.getFirstColumn();
//            int lastColumn = mergedRegion.getLastColumn();
//            int firstRow = mergedRegion.getFirstRow();
//            if(firstRow >= 2 && firstColumn >= 3 && lastColumn <= 5){
//                removeMergedRegionIndexList.add(i);
//            }
//        }
//        firstSheet.removeMergedRegions(removeMergedRegionIndexList);
        HttpServletResponse response = WebUtils.response();
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");