From 71049a2149033ced0d498f2f9ed3d5d1b9ed644d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 19 七月 2024 16:12:34 +0800
Subject: [PATCH] 对象建模——枚举和枚举项的查询、新增、修改、删除、查看使用范围、下载导入模板、导入、导出接口并联调。

---
 Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java b/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java
index aedbcdf..2ed445e 100644
--- a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java
@@ -1,5 +1,6 @@
 package com.vci.starter.poi.util;
 
+import cn.hutool.core.collection.CollUtil;
 import com.vci.starter.poi.annotation.ExcelColumn;
 import com.vci.starter.poi.annotation.ExcelTitle;
 import com.vci.starter.poi.bo.*;
@@ -630,6 +631,8 @@
 					//鍐欏��
 					setCellValue(cell, value);
 				}
+				//璁剧疆鑷�傚簲鍒楀
+				sheet.autoSizeColumn(ed.getCol());
 				if(ed.getWidth()!=null && ed.getWidth()>0){
 					sheet.setColumnWidth(cell.getColumnIndex(),(int)(ed.getWidth() + 0.72)*256);
 				}
@@ -855,6 +858,7 @@
 				if (ed.getColTo() < ed.getCol()) {
 					ed.setColTo(ed.getCol());
 				}
+				List<CellRangeAddress> cellRangeAddressList = sheet.getMergedRegions();
 				sheet.addMergedRegion(new CellRangeAddress(ed.getRow(), ed.getRowTo(), ed.getCol(), ed.getColTo()));
 			});
 		}

--
Gitblit v1.9.3