From 49872c55eafb15b4919767a2dfba4cd06a9812b9 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 4 Nov 2022 12:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=A1=AB=E5=86=99=E4=BA=BA=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5bug62128,62110?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 85ff6e8d9..fdc96ed17 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -63,6 +63,7 @@ import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFDataFormat;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -2484,11 +2485,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			String[] headers = titles[1].split(",");
 			XSSFCellStyle cellStyle =workbook.createCellStyle();
 			cellStyle.setWrapText(true);
-//            cellStyle.setAlignment(XSSFCellStyle.ALIGN_CENTER);
-			cellStyle.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
+			cellStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("@")); // 设置文本格式
 
 			XSSFCellStyle cellStyle1 =workbook.createCellStyle();
-			cellStyle1.setAlignment(XSSFCellStyle.ALIGN_CENTER);
+			cellStyle1.setVerticalAlignment(VerticalAlignment.CENTER);
+//			cellStyle1.setAlignment(XSSFCellStyle.ALIGN_CENTER);
 
 			//合并单元格
 			CellRangeAddress region1 =
@@ -2508,8 +2509,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				XSSFCell cell = row.createCell(i);
 				XSSFRichTextString text = new XSSFRichTextString(headers[i]);
 				cell.setCellValue(text);
-				cell.setCellStyle(cellStyle1);
+//				cell.setCellStyle(cellStyle1);
 				sheetItems.setColumnWidth(i, 20 * 256); // 设置单元格宽度
+				sheetItems.setDefaultColumnStyle(i, cellStyle);
 			}
 			// 在excel表中添加添加填写说明
 			String explanation = "";