From 37870d4ef29d56489aac567dff527c7144caf91e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 17 四月 2026 10:21:31 +0800
Subject: [PATCH] 兼容postgresql
---
common/src/main/java/com/ycl/common/utils/excel/convert/ExcelEnumConvert.java | 10 ++++++++++
business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java b/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
index 13146c7..e7b1fab 100644
--- a/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
+++ b/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
@@ -677,13 +677,13 @@
* 椤圭洰骞寸患鍚堣兘婧愭秷璐归噺锛堟爣鍑嗙叅褰撻噺鍊硷級
*/
@ExcelProperty(value = "椤圭洰骞寸患鍚堣兘婧愭秷璐归噺锛堟爣鍑嗙叅褰撻噺鍊硷級")
- private BigDecimal annualEnergyConsumption;
+ private String annualEnergyConsumption;
/**
* 椤圭洰骞寸數鍔涙秷鑰楅噺锛堟爣鍑嗙叅褰撻噺鍊硷級
*/
@ExcelProperty(value = "椤圭洰骞寸數鍔涙秷鑰楅噺锛堟爣鍑嗙叅褰撻噺鍊硷級")
- private BigDecimal annualElectricityConsumption;
+ private String annualElectricityConsumption;
/* 鐩稿叧鏂囦功 */
diff --git a/common/src/main/java/com/ycl/common/utils/excel/convert/ExcelEnumConvert.java b/common/src/main/java/com/ycl/common/utils/excel/convert/ExcelEnumConvert.java
index b2479fb..dea1372 100644
--- a/common/src/main/java/com/ycl/common/utils/excel/convert/ExcelEnumConvert.java
+++ b/common/src/main/java/com/ycl/common/utils/excel/convert/ExcelEnumConvert.java
@@ -49,6 +49,11 @@
if (ObjectUtil.isNull(textValue)) {
return null;
}
+ ExcelEnumFormat anno = getAnnotation(contentProperty.getField());
+ // 瀛楁鏈厤缃灇涓炬敞瑙ｆ椂锛屾寜鍘熷鍊艰浆鎹紝閬垮厤绌烘寚閽堝鑷村鍏�/瀵煎嚭涓柇
+ if (ObjectUtil.isNull(anno)) {
+ return Convert.convert(contentProperty.getField().getType(), textValue);
+ }
Map<Object, String> enumCodeToTextMap = beforeConvert(contentProperty);
// 浠嶫ava杈撳嚭鑷矱xcel鏄痗ode杞瑃ext
// 鍥犳浠嶦xcel杞琂ava搴旇灏唗ext涓巆ode瀵硅皟
@@ -64,6 +69,11 @@
if (ObjectUtil.isNull(object)) {
return new WriteCellData<>("");
}
+ ExcelEnumFormat anno = getAnnotation(contentProperty.getField());
+ // 瀛楁鏈厤缃灇涓炬敞瑙ｆ椂锛屾寜鍘熷�艰緭鍑烘枃鏈�
+ if (ObjectUtil.isNull(anno)) {
+ return new WriteCellData<>(Convert.toStr(object, ""));
+ }
Map<Object, String> enumValueMap = beforeConvert(contentProperty);
String value = Convert.toStr(enumValueMap.get(object), "");
return new WriteCellData<>(value);
--
Gitblit v1.8.0