Merge pull request #3050 from GengMS/v5-dev

Issue#3048: 添加 数字单元格精度据单元格实际数值自动适配新特性;

hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java

@@ -307,6 +307,16 @@ public class ExcelWriter extends ExcelBase<ExcelWriter> {
 		return this;
 	}
 
+	/**
+	 * 设置 是否数字类型单元格精度根据单元格实际数值自动适配
+	 * @param autoPrecision
+	 * @return this
+	 */
+	public ExcelWriter setNumberAutoPrecision(boolean autoPrecision) {
+		this.styleSet.setNumberAutoPrecision(autoPrecision);
+		return this;
+	}
+
 	/**
 	 * 获取样式集，样式集可以自定义包括：<br>
 	 *

hutool-poi/src/main/java/cn/hutool/poi/excel/StyleSet.java

@@ -51,6 +51,10 @@ public class StyleSet implements Serializable {
 	 */
 	protected final CellStyle cellStyleForHyperlink;
 
+	/**
+	 * 数字类型单元格精度根据单元格实际数值自动适配
+	 */
+	protected Boolean numberAutoPrecision;
 	/**
 	 * 构造
 	 *
@@ -78,6 +82,9 @@ public class StyleSet implements Serializable {
 		font.setUnderline((byte) 1);
 		font.setColor(HSSFColor.HSSFColorPredefined.BLUE.getIndex());
 		this.cellStyleForHyperlink.setFont(font);
+
+		// 数字类型单元格精度根据单元格实际数值自动适配
+		this.setNumberAutoPrecision(false);
 	}
 
 	/**
@@ -126,6 +133,14 @@ public class StyleSet implements Serializable {
 		return this.cellStyleForHyperlink;
 	}
 
+	public Boolean getNumberAutoPrecision() {
+		return numberAutoPrecision;
+	}
+
+	public void setNumberAutoPrecision(Boolean numberAutoPrecision) {
+		this.numberAutoPrecision = numberAutoPrecision;
+	}
+
 	/**
 	 * 定义所有单元格的边框类型
 	 *
@@ -254,8 +269,13 @@ public class StyleSet implements Serializable {
 			// 数字单独定义格式
 			if ((value instanceof Double || value instanceof Float || value instanceof BigDecimal) &&
 					null != this.cellStyleForNumber) {
+				BigDecimal bigDecimalValue = new BigDecimal(value.toString());
+				if(numberAutoPrecision){
+					this.cellStyleForNumber.setDataFormat((short)bigDecimalValue.precision());
+				}else{
 					style = this.cellStyleForNumber;
 				}
+			}
 		} else if (value instanceof Hyperlink) {
 			// 自定义超链接样式
 			if (null != this.cellStyleForHyperlink) {

hutool-poi/src/test/java/cn/hutool/poi/excel/Issue3048Test.java

@@ -0,0 +1,39 @@
+package cn.hutool.poi.excel;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * https://github.com/dromara/hutool/issues/3048 Excel导出javaBean中有BigDecimal类型精度流失
+ *
+ */
+public class Issue3048Test {
+	@Test
+	@Ignore
+	public void excelOutPutBeanListToExcel(){
+		List<TestBean> excelExportList = new ArrayList<>();
+		excelExportList.add(new TestBean("1", new BigDecimal("1.22")));
+		excelExportList.add(new TestBean("2", new BigDecimal("2.342")));
+		excelExportList.add(new TestBean("3", new BigDecimal("1.2346")));
+		ExcelWriter excelWriter = ExcelUtil.getWriter(true);
+		excelWriter.setNumberAutoPrecision(true);
+		excelWriter.write(excelExportList, true);
+		excelWriter.flush(new File("e:/test.xlsx"));
+		excelWriter.close();
+	}
+
+	@Data
+	@AllArgsConstructor
+	static class TestBean{
+		private String testKey;
+		private BigDecimal testValue;
+	}
+}