From ec9a95eb994018cc1ba28a80946165f795001dea Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 29 十一月 2024 16:49:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 58228b0..b1fdfa3 100644
--- a/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
+++ b/business/src/main/java/com/ycl/domain/excel/ProjectExcelTemplate.java
@@ -2,6 +2,11 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.common.enums.business.ImportanceTypeEnum;
+import com.ycl.common.enums.business.ProjectStatusEnum;
+import com.ycl.common.enums.business.ProjectTypeEnum;
+import com.ycl.common.utils.excel.annotation.ExcelEnumFormat;
+import com.ycl.common.utils.excel.convert.ExcelEnumConvert;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -36,13 +41,15 @@
/**
* 椤圭洰绫诲瀷
*/
- @ExcelProperty(value = "椤圭洰绫诲瀷")
+ @ExcelProperty(value = "椤圭洰绫诲瀷",converter = ExcelEnumConvert.class)
+ @ExcelEnumFormat(enumClass = ProjectTypeEnum.class,codeField = "type",textField = "desc")
private String projectType;
/**
* 椤圭洰鐘舵��
*/
- @ExcelProperty(value = "椤圭洰鐘舵��")
+ @ExcelProperty(value = "椤圭洰鐘舵��",converter = ExcelEnumConvert.class)
+ @ExcelEnumFormat(enumClass = ProjectStatusEnum.class,codeField = "type",textField = "desc")
private String projectStatus;
/**
@@ -60,7 +67,8 @@
/**
* 閲嶇偣鍒嗙被
*/
- @ExcelProperty(value = "閲嶇偣鍒嗙被")
+ @ExcelProperty(value = "閲嶇偣鍒嗙被",converter = ExcelEnumConvert.class)
+ @ExcelEnumFormat(enumClass = ImportanceTypeEnum.class,codeField = "type",textField = "desc")
private String importanceType;
/**
--
Gitblit v1.8.0