From 8d9596f650523d8b6981657bd26078cb1ec09885 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 13 三月 2025 16:57:06 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
index 7de049c..16082a1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
+++ b/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");
--
Gitblit v1.7.1