diff --git a/cds-platform-2025.V1/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDateConvert.java b/cds-platform-2025.V1/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDateConvert.java new file mode 100644 index 0000000..471a4a3 --- /dev/null +++ b/cds-platform-2025.V1/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDateConvert.java @@ -0,0 +1,32 @@ +package org.dromara.common.excel.convert; + +import java.text.SimpleDateFormat; +import java.util.Date; +import cn.idev.excel.converters.Converter; +import cn.idev.excel.enums.CellDataTypeEnum; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.ReadCellData; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; +public class ExcelDateConvert implements Converter { + + @Override + public Class supportJavaTypeKey() { + return Date.class; + } + + @Override + public WriteCellData convertToExcelData(Date value, + ExcelContentProperty contentProperty, + GlobalConfiguration globalConfig) { + String pattern = "yyyy-MM-dd"; // 默认格式 + if(contentProperty != null && + contentProperty.getDateTimeFormatProperty() != null){ + pattern = contentProperty.getDateTimeFormatProperty().getFormat(); + } + SimpleDateFormat sdf = new SimpleDateFormat(pattern); + return new WriteCellData<>(sdf.format(value)); + } + + +} diff --git a/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryExportVo.java b/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryExportVo.java index 79b00c1..c10a214 100644 --- a/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryExportVo.java +++ b/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/vo/MpsDetailEntryExportVo.java @@ -5,6 +5,7 @@ import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDateConvert; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.mps.domain.MpsDetailEntry; @@ -79,7 +80,8 @@ public class MpsDetailEntryExportVo implements Serializable { /** * 数据日期 */ - @ExcelProperty(value = "数据日期") + @ExcelProperty(value = "数据日期", converter = ExcelDateConvert.class) +// @DateTimeFormat("yyyy/MM/dd") //指定格式 private Date date; // /** @@ -98,7 +100,7 @@ public class MpsDetailEntryExportVo implements Serializable { * 客户类型(1-个人,2-对公) */ @ExcelProperty(value = "客户类型", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "1=个人,2=对公") + @ExcelDictFormat(dictType = "mps_cust_type") private String custType; /**