From c7dc2ee0436bdf23ee34d5be1ebd8e034f5fe141 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期一, 02 九月 2024 16:55:01 +0800
Subject: [PATCH] 1、删除查询方案删除的参数修改。 2、查询模板的列表添加了字段的相关属性新增。
---
Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java | 5 +++++
1 files changed, 5 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..a5d5e0e 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()));
});
}
@@ -993,6 +997,7 @@
try {
for (int sheetIndex = 0; sheetIndex < workbook.getNumberOfSheets(); sheetIndex++) {
Sheet sheet = workbook.getSheetAt(sheetIndex);
+ String sheetName=sheet.getSheetName();
if(StringUtils.isNotBlank(excelOption.getSheetName())){
if(!sheet.getSheetName().equalsIgnoreCase(excelOption.getSheetName())){
continue;
--
Gitblit v1.10.0