From f5ab83dfad01c87828232af8cd18c676e69fd917 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 21 五月 2025 09:14:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/system_service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java b/server/system_service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
index c6f70ac..05624af 100644
--- a/server/system_service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
+++ b/server/system_service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -447,16 +447,19 @@
                 List<String> rowList = dataList.get(i);
                 for (int j = 0; j < rowList.size(); j++) {
                     Cell cell = row.createCell(j);
-                    if(i==0&&j==0){
-                        cell.setCellValue("鏁版嵁鏃ユ湡");
-                    }else{
-                        cell.setCellValue(rowList.get(j));
-                    }
-
+                    cell.setCellValue(rowList.get(j));
+//                    if(i==0&&j==0){
+//                        cell.setCellValue("鏁版嵁鏃ユ湡");
+//                    }else{
+//                        cell.setCellValue(rowList.get(j));
+//                    }
                     if(i==0){
-                        sheet.setColumnWidth(i, rowList.get(i).length() * 2 * 256);
+                        sheet.setColumnWidth(i, (rowList.get(j).length() + 2 )  * 2 * 256);
+//                        cell.setCellStyle(hstyle);
+                    }
+                    if(i==0 || j==0){
                         cell.setCellStyle(hstyle);
-                    }else if(j==0){
+                    }else{
                         cell.setCellStyle(rowStyle);
                     }
                 }
@@ -502,8 +505,8 @@
         configDataCellStyle.setAlignment(HorizontalAlignment.CENTER);
         configDataCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
         // 璁剧疆鑳屾櫙
-        configDataCellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        configDataCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+//        configDataCellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+//        configDataCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
         // 瀛椾綋
         Font font = workbook.createFont();
         font.setFontHeightInPoints((short) 10);
@@ -512,7 +515,6 @@
         // 杈规
         configCellBorder(configDataCellStyle);
         configDataCellStyle.setWrapText(true);
-
         return configDataCellStyle;
     }
 

--
Gitblit v1.9.3