From 0d7e1cba0b6f0b72eac596c09c43c1e828f5affa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 16 五月 2025 13:50:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 585c797..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,14 +447,14 @@
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){
--
Gitblit v1.9.3