From 3f10aa699267f13d8575b92a9634f2c037c1f183 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 26 八月 2024 19:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-common/src/main/java/enumeration/converter/RuleDeductCategoryConverter.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ycl-common/src/main/java/enumeration/converter/RuleDeductCategoryConverter.java b/ycl-common/src/main/java/enumeration/converter/RuleDeductCategoryConverter.java
index a972243..98cdc28 100644
--- a/ycl-common/src/main/java/enumeration/converter/RuleDeductCategoryConverter.java
+++ b/ycl-common/src/main/java/enumeration/converter/RuleDeductCategoryConverter.java
@@ -7,14 +7,12 @@
import com.alibaba.excel.metadata.data.WriteCellData;
import com.alibaba.excel.metadata.property.ExcelContentProperty;
import enumeration.general.RuleDeductCategoryEnum;
-import lombok.extern.slf4j.Slf4j;
/**
* 鎵ｅ垎绫诲瀷鏋氫妇瑁呮崲鍣�
*
* @author gonghl
*/
-@Slf4j
public class RuleDeductCategoryConverter implements Converter<RuleDeductCategoryEnum> {
@Override
@@ -28,7 +26,7 @@
}
@Override
- public RuleDeductCategoryEnum convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+ public RuleDeductCategoryEnum convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
if (cellData.getStringValue().equals(RuleDeductCategoryEnum.DEDUCT_POINTS.getDesc())) {
return RuleDeductCategoryEnum.DEDUCT_POINTS;
} else if (cellData.getStringValue().equals(RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY.getDesc())) {
@@ -41,7 +39,7 @@
}
@Override
- public WriteCellData convertToExcelData(RuleDeductCategoryEnum value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
- return new WriteCellData(value.getDesc());
+ public WriteCellData<RuleDeductCategoryEnum> convertToExcelData(RuleDeductCategoryEnum value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ return new WriteCellData<>(value.getDesc());
}
}
\ No newline at end of file
--
Gitblit v1.8.0