Commit 173264e2cb23b322cabdce769ccee4d96de8b984
1 parent
8ff33636
feat(excel): 升级 FastExcel 为 Apache Fesod 2.1.0-incubating
- 迁移依赖坐标、包名和代码生成模板 - 修复全局 Long 转换器不生效导致的导出精度丢失(https://t.zsxq.com/a0w1V)
Showing
235 changed files
with
589 additions
and
442 deletions
Too many changes.
To preserve performance only 100 of 235 files are displayed.
yudao-dependencies/pom.xml
| @@ -59,7 +59,7 @@ | @@ -59,7 +59,7 @@ | ||
| 59 | <mapstruct.version>1.7.0.Beta2</mapstruct.version> | 59 | <mapstruct.version>1.7.0.Beta2</mapstruct.version> |
| 60 | <hutool-5.version>5.8.47</hutool-5.version> | 60 | <hutool-5.version>5.8.47</hutool-5.version> |
| 61 | <hutool-6.version>6.0.0-M22</hutool-6.version> | 61 | <hutool-6.version>6.0.0-M22</hutool-6.version> |
| 62 | - <fastexcel.version>1.3.0</fastexcel.version> | 62 | + <fesod.version>2.1.0-incubating</fesod.version> |
| 63 | <aviator.version>5.4.4</aviator.version> | 63 | <aviator.version>5.4.4</aviator.version> |
| 64 | <velocity.version>2.4.1</velocity.version> | 64 | <velocity.version>2.4.1</velocity.version> |
| 65 | <fastjson2.version>2.0.65</fastjson2.version> | 65 | <fastjson2.version>2.0.65</fastjson2.version> |
| @@ -516,9 +516,9 @@ | @@ -516,9 +516,9 @@ | ||
| 516 | </dependency> | 516 | </dependency> |
| 517 | 517 | ||
| 518 | <dependency> | 518 | <dependency> |
| 519 | - <groupId>cn.idev.excel</groupId> | ||
| 520 | - <artifactId>fastexcel</artifactId> | ||
| 521 | - <version>${fastexcel.version}</version> | 519 | + <groupId>org.apache.fesod</groupId> |
| 520 | + <artifactId>fesod-sheet</artifactId> | ||
| 521 | + <version>${fesod.version}</version> | ||
| 522 | </dependency> | 522 | </dependency> |
| 523 | 523 | ||
| 524 | <dependency> | 524 | <dependency> |
yudao-framework/yudao-spring-boot-starter-excel/pom.xml
| @@ -42,8 +42,8 @@ | @@ -42,8 +42,8 @@ | ||
| 42 | 42 | ||
| 43 | <!-- 工具类相关 --> | 43 | <!-- 工具类相关 --> |
| 44 | <dependency> | 44 | <dependency> |
| 45 | - <groupId>cn.idev.excel</groupId> | ||
| 46 | - <artifactId>fastexcel</artifactId> | 45 | + <groupId>org.apache.fesod</groupId> |
| 46 | + <artifactId>fesod-sheet</artifactId> | ||
| 47 | </dependency> | 47 | </dependency> |
| 48 | 48 | ||
| 49 | <dependency> | 49 | <dependency> |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/AreaConvert.java
| @@ -3,13 +3,13 @@ package cn.iocoder.yudao.framework.excel.core.convert; | @@ -3,13 +3,13 @@ package cn.iocoder.yudao.framework.excel.core.convert; | ||
| 3 | import cn.hutool.core.convert.Convert; | 3 | import cn.hutool.core.convert.Convert; |
| 4 | import cn.iocoder.yudao.framework.ip.core.Area; | 4 | import cn.iocoder.yudao.framework.ip.core.Area; |
| 5 | import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; | 5 | import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; |
| 6 | -import cn.idev.excel.converters.Converter; | ||
| 7 | -import cn.idev.excel.enums.CellDataTypeEnum; | ||
| 8 | -import cn.idev.excel.metadata.GlobalConfiguration; | ||
| 9 | -import cn.idev.excel.metadata.data.ReadCellData; | ||
| 10 | -import cn.idev.excel.metadata.data.WriteCellData; | ||
| 11 | -import cn.idev.excel.metadata.property.ExcelContentProperty; | ||
| 12 | import lombok.extern.slf4j.Slf4j; | 6 | import lombok.extern.slf4j.Slf4j; |
| 7 | +import org.apache.fesod.sheet.converters.Converter; | ||
| 8 | +import org.apache.fesod.sheet.enums.CellDataTypeEnum; | ||
| 9 | +import org.apache.fesod.sheet.metadata.GlobalConfiguration; | ||
| 10 | +import org.apache.fesod.sheet.metadata.data.ReadCellData; | ||
| 11 | +import org.apache.fesod.sheet.metadata.data.WriteCellData; | ||
| 12 | +import org.apache.fesod.sheet.metadata.property.ExcelContentProperty; | ||
| 13 | 13 | ||
| 14 | /** | 14 | /** |
| 15 | * Excel 数据地区转换器 | 15 | * Excel 数据地区转换器 |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java
| @@ -3,13 +3,13 @@ package cn.iocoder.yudao.framework.excel.core.convert; | @@ -3,13 +3,13 @@ package cn.iocoder.yudao.framework.excel.core.convert; | ||
| 3 | import cn.hutool.core.convert.Convert; | 3 | import cn.hutool.core.convert.Convert; |
| 4 | import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils; | 4 | import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils; |
| 5 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 5 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 6 | -import cn.idev.excel.converters.Converter; | ||
| 7 | -import cn.idev.excel.enums.CellDataTypeEnum; | ||
| 8 | -import cn.idev.excel.metadata.GlobalConfiguration; | ||
| 9 | -import cn.idev.excel.metadata.data.ReadCellData; | ||
| 10 | -import cn.idev.excel.metadata.data.WriteCellData; | ||
| 11 | -import cn.idev.excel.metadata.property.ExcelContentProperty; | ||
| 12 | import lombok.extern.slf4j.Slf4j; | 6 | import lombok.extern.slf4j.Slf4j; |
| 7 | +import org.apache.fesod.sheet.converters.Converter; | ||
| 8 | +import org.apache.fesod.sheet.enums.CellDataTypeEnum; | ||
| 9 | +import org.apache.fesod.sheet.metadata.GlobalConfiguration; | ||
| 10 | +import org.apache.fesod.sheet.metadata.data.ReadCellData; | ||
| 11 | +import org.apache.fesod.sheet.metadata.data.WriteCellData; | ||
| 12 | +import org.apache.fesod.sheet.metadata.property.ExcelContentProperty; | ||
| 13 | 13 | ||
| 14 | /** | 14 | /** |
| 15 | * Excel 数据字典转换器 | 15 | * Excel 数据字典转换器 |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/JsonConvert.java
| 1 | package cn.iocoder.yudao.framework.excel.core.convert; | 1 | package cn.iocoder.yudao.framework.excel.core.convert; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; | 3 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; |
| 4 | -import cn.idev.excel.converters.Converter; | ||
| 5 | -import cn.idev.excel.enums.CellDataTypeEnum; | ||
| 6 | -import cn.idev.excel.metadata.GlobalConfiguration; | ||
| 7 | -import cn.idev.excel.metadata.data.WriteCellData; | ||
| 8 | -import cn.idev.excel.metadata.property.ExcelContentProperty; | 4 | +import org.apache.fesod.sheet.converters.Converter; |
| 5 | +import org.apache.fesod.sheet.enums.CellDataTypeEnum; | ||
| 6 | +import org.apache.fesod.sheet.metadata.GlobalConfiguration; | ||
| 7 | +import org.apache.fesod.sheet.metadata.data.WriteCellData; | ||
| 8 | +import org.apache.fesod.sheet.metadata.property.ExcelContentProperty; | ||
| 9 | 9 | ||
| 10 | /** | 10 | /** |
| 11 | * Excel Json 转换器 | 11 | * Excel Json 转换器 |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/MoneyConvert.java
| 1 | package cn.iocoder.yudao.framework.excel.core.convert; | 1 | package cn.iocoder.yudao.framework.excel.core.convert; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.converters.Converter; | ||
| 4 | -import cn.idev.excel.enums.CellDataTypeEnum; | ||
| 5 | -import cn.idev.excel.metadata.GlobalConfiguration; | ||
| 6 | -import cn.idev.excel.metadata.data.WriteCellData; | ||
| 7 | -import cn.idev.excel.metadata.property.ExcelContentProperty; | 3 | +import org.apache.fesod.sheet.converters.Converter; |
| 4 | +import org.apache.fesod.sheet.enums.CellDataTypeEnum; | ||
| 5 | +import org.apache.fesod.sheet.metadata.GlobalConfiguration; | ||
| 6 | +import org.apache.fesod.sheet.metadata.data.WriteCellData; | ||
| 7 | +import org.apache.fesod.sheet.metadata.property.ExcelContentProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.math.RoundingMode; | 10 | import java.math.RoundingMode; |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/MultiDictConvert.java
| @@ -4,13 +4,13 @@ import cn.hutool.core.convert.Convert; | @@ -4,13 +4,13 @@ import cn.hutool.core.convert.Convert; | ||
| 4 | import cn.hutool.core.util.StrUtil; | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils; | 5 | import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils; |
| 6 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 6 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 7 | -import cn.idev.excel.converters.Converter; | ||
| 8 | -import cn.idev.excel.enums.CellDataTypeEnum; | ||
| 9 | -import cn.idev.excel.metadata.GlobalConfiguration; | ||
| 10 | -import cn.idev.excel.metadata.data.ReadCellData; | ||
| 11 | -import cn.idev.excel.metadata.data.WriteCellData; | ||
| 12 | -import cn.idev.excel.metadata.property.ExcelContentProperty; | ||
| 13 | import lombok.extern.slf4j.Slf4j; | 7 | import lombok.extern.slf4j.Slf4j; |
| 8 | +import org.apache.fesod.sheet.converters.Converter; | ||
| 9 | +import org.apache.fesod.sheet.enums.CellDataTypeEnum; | ||
| 10 | +import org.apache.fesod.sheet.metadata.GlobalConfiguration; | ||
| 11 | +import org.apache.fesod.sheet.metadata.data.ReadCellData; | ||
| 12 | +import org.apache.fesod.sheet.metadata.data.WriteCellData; | ||
| 13 | +import org.apache.fesod.sheet.metadata.property.ExcelContentProperty; | ||
| 14 | 14 | ||
| 15 | import java.lang.reflect.Array; | 15 | import java.lang.reflect.Array; |
| 16 | import java.lang.reflect.Field; | 16 | import java.lang.reflect.Field; |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/StringListConvert.java
| @@ -2,11 +2,11 @@ package cn.iocoder.yudao.framework.excel.core.convert; | @@ -2,11 +2,11 @@ package cn.iocoder.yudao.framework.excel.core.convert; | ||
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.hutool.core.util.StrUtil; | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | -import cn.idev.excel.converters.Converter; | ||
| 6 | -import cn.idev.excel.metadata.GlobalConfiguration; | ||
| 7 | -import cn.idev.excel.metadata.data.ReadCellData; | ||
| 8 | -import cn.idev.excel.metadata.data.WriteCellData; | ||
| 9 | -import cn.idev.excel.metadata.property.ExcelContentProperty; | 5 | +import org.apache.fesod.sheet.converters.Converter; |
| 6 | +import org.apache.fesod.sheet.metadata.GlobalConfiguration; | ||
| 7 | +import org.apache.fesod.sheet.metadata.data.ReadCellData; | ||
| 8 | +import org.apache.fesod.sheet.metadata.data.WriteCellData; | ||
| 9 | +import org.apache.fesod.sheet.metadata.property.ExcelContentProperty; | ||
| 10 | 10 | ||
| 11 | import java.util.Collections; | 11 | import java.util.Collections; |
| 12 | import java.util.List; | 12 | import java.util.List; |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/ColumnWidthMatchStyleStrategy.java
| 1 | package cn.iocoder.yudao.framework.excel.core.handler; | 1 | package cn.iocoder.yudao.framework.excel.core.handler; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.idev.excel.enums.CellDataTypeEnum; | ||
| 5 | -import cn.idev.excel.metadata.Head; | ||
| 6 | -import cn.idev.excel.metadata.data.WriteCellData; | ||
| 7 | -import cn.idev.excel.util.MapUtils; | ||
| 8 | -import cn.idev.excel.write.metadata.holder.WriteSheetHolder; | ||
| 9 | -import cn.idev.excel.write.style.column.AbstractColumnWidthStyleStrategy; | ||
| 10 | -import cn.idev.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; | 4 | +import org.apache.fesod.common.util.MapUtils; |
| 5 | +import org.apache.fesod.sheet.enums.CellDataTypeEnum; | ||
| 6 | +import org.apache.fesod.sheet.metadata.Head; | ||
| 7 | +import org.apache.fesod.sheet.metadata.data.WriteCellData; | ||
| 8 | +import org.apache.fesod.sheet.write.metadata.holder.WriteSheetHolder; | ||
| 9 | +import org.apache.fesod.sheet.write.style.column.AbstractColumnWidthStyleStrategy; | ||
| 10 | +import org.apache.fesod.sheet.write.style.column.LongestMatchColumnWidthStyleStrategy; | ||
| 11 | import org.apache.poi.ss.usermodel.Cell; | 11 | import org.apache.poi.ss.usermodel.Cell; |
| 12 | 12 | ||
| 13 | import java.util.HashMap; | 13 | import java.util.HashMap; |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/SelectSheetWriteHandler.java
| @@ -10,13 +10,13 @@ import cn.iocoder.yudao.framework.common.core.KeyValue; | @@ -10,13 +10,13 @@ import cn.iocoder.yudao.framework.common.core.KeyValue; | ||
| 10 | import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils; | 10 | import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils; |
| 11 | import cn.iocoder.yudao.framework.excel.core.annotations.ExcelColumnSelect; | 11 | import cn.iocoder.yudao.framework.excel.core.annotations.ExcelColumnSelect; |
| 12 | import cn.iocoder.yudao.framework.excel.core.function.ExcelColumnSelectFunction; | 12 | import cn.iocoder.yudao.framework.excel.core.function.ExcelColumnSelectFunction; |
| 13 | -import cn.idev.excel.annotation.ExcelIgnore; | ||
| 14 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 15 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 16 | -import cn.idev.excel.write.handler.SheetWriteHandler; | ||
| 17 | -import cn.idev.excel.write.metadata.holder.WriteSheetHolder; | ||
| 18 | -import cn.idev.excel.write.metadata.holder.WriteWorkbookHolder; | ||
| 19 | import lombok.extern.slf4j.Slf4j; | 13 | import lombok.extern.slf4j.Slf4j; |
| 14 | +import org.apache.fesod.sheet.annotation.ExcelIgnore; | ||
| 15 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 16 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 17 | +import org.apache.fesod.sheet.write.handler.SheetWriteHandler; | ||
| 18 | +import org.apache.fesod.sheet.write.metadata.holder.WriteSheetHolder; | ||
| 19 | +import org.apache.fesod.sheet.write.metadata.holder.WriteWorkbookHolder; | ||
| 20 | import org.apache.poi.hssf.usermodel.HSSFDataValidation; | 20 | import org.apache.poi.hssf.usermodel.HSSFDataValidation; |
| 21 | import org.apache.poi.ss.usermodel.*; | 21 | import org.apache.poi.ss.usermodel.*; |
| 22 | import org.apache.poi.ss.util.CellRangeAddressList; | 22 | import org.apache.poi.ss.util.CellRangeAddressList; |
| @@ -86,7 +86,7 @@ public class SelectSheetWriteHandler implements SheetWriteHandler { | @@ -86,7 +86,7 @@ public class SelectSheetWriteHandler implements SheetWriteHandler { | ||
| 86 | 86 | ||
| 87 | /** | 87 | /** |
| 88 | * 判断字段是否是静态的、最终的、 transient 的 | 88 | * 判断字段是否是静态的、最终的、 transient 的 |
| 89 | - * 原因:FastExcel 默认是忽略 static final 或 transient 的字段,所以需要判断 | 89 | + * 原因:Fesod 默认是忽略 static final 或 transient 的字段,所以需要判断 |
| 90 | * | 90 | * |
| 91 | * @param field 字段 | 91 | * @param field 字段 |
| 92 | * @return 是否是静态的、最终的、transient 的 | 92 | * @return 是否是静态的、最终的、transient 的 |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
| 1 | package cn.iocoder.yudao.framework.excel.core.util; | 1 | package cn.iocoder.yudao.framework.excel.core.util; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.FastExcelFactory; | ||
| 4 | -import cn.idev.excel.context.AnalysisContext; | ||
| 5 | -import cn.idev.excel.converters.longconverter.LongStringConverter; | ||
| 6 | -import cn.idev.excel.read.listener.ReadListener; | ||
| 7 | import cn.iocoder.yudao.framework.common.util.http.HttpUtils; | 3 | import cn.iocoder.yudao.framework.common.util.http.HttpUtils; |
| 8 | import cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy; | 4 | import cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy; |
| 9 | import cn.iocoder.yudao.framework.excel.core.handler.SelectSheetWriteHandler; | 5 | import cn.iocoder.yudao.framework.excel.core.handler.SelectSheetWriteHandler; |
| 10 | import jakarta.servlet.http.HttpServletResponse; | 6 | import jakarta.servlet.http.HttpServletResponse; |
| 7 | +import org.apache.fesod.sheet.FesodSheet; | ||
| 8 | +import org.apache.fesod.sheet.context.AnalysisContext; | ||
| 9 | +import org.apache.fesod.sheet.converters.Converter; | ||
| 10 | +import org.apache.fesod.sheet.converters.longconverter.LongStringConverter; | ||
| 11 | +import org.apache.fesod.sheet.enums.CellDataTypeEnum; | ||
| 12 | +import org.apache.fesod.sheet.read.listener.ReadListener; | ||
| 11 | import org.springframework.web.multipart.MultipartFile; | 13 | import org.springframework.web.multipart.MultipartFile; |
| 12 | 14 | ||
| 13 | import java.io.IOException; | 15 | import java.io.IOException; |
| @@ -25,6 +27,21 @@ import java.util.Map; | @@ -25,6 +27,21 @@ import java.util.Map; | ||
| 25 | public class ExcelUtils { | 27 | public class ExcelUtils { |
| 26 | 28 | ||
| 27 | /** | 29 | /** |
| 30 | + * Long 转 String 的转换器,避免 Long 类型丢失精度 | ||
| 31 | + * | ||
| 32 | + * 参考 https://t.zsxq.com/a0w1V 帖子:Fesod 写入 xlsx 时,按 supportExcelTypeKey 为 null 查找全局转换器, | ||
| 33 | + * 所以需要返回 null,否则 registerConverter 的 LongStringConverter 不生效。关联 https://github.com/apache/fesod/issues/648 | ||
| 34 | + */ | ||
| 35 | + private static final Converter<Long> LONG_STRING_CONVERTER = new LongStringConverter() { | ||
| 36 | + | ||
| 37 | + @Override | ||
| 38 | + public CellDataTypeEnum supportExcelTypeKey() { | ||
| 39 | + return null; | ||
| 40 | + } | ||
| 41 | + | ||
| 42 | + }; | ||
| 43 | + | ||
| 44 | + /** | ||
| 28 | * 将列表以 Excel 响应给前端 | 45 | * 将列表以 Excel 响应给前端 |
| 29 | * | 46 | * |
| 30 | * @param response 响应 | 47 | * @param response 响应 |
| @@ -38,11 +55,11 @@ public class ExcelUtils { | @@ -38,11 +55,11 @@ public class ExcelUtils { | ||
| 38 | public static <T> void write(HttpServletResponse response, String filename, String sheetName, | 55 | public static <T> void write(HttpServletResponse response, String filename, String sheetName, |
| 39 | Class<T> head, List<T> data) throws IOException { | 56 | Class<T> head, List<T> data) throws IOException { |
| 40 | // 输出 Excel | 57 | // 输出 Excel |
| 41 | - FastExcelFactory.write(response.getOutputStream(), head) | 58 | + FesodSheet.write(response.getOutputStream(), head) |
| 42 | .autoCloseStream(false) // 不要自动关闭,交给 Servlet 自己处理 | 59 | .autoCloseStream(false) // 不要自动关闭,交给 Servlet 自己处理 |
| 43 | .registerWriteHandler(new ColumnWidthMatchStyleStrategy()) // 基于 column 长度,自动适配。最大 255 宽度 | 60 | .registerWriteHandler(new ColumnWidthMatchStyleStrategy()) // 基于 column 长度,自动适配。最大 255 宽度 |
| 44 | .registerWriteHandler(new SelectSheetWriteHandler(head)) // 基于固定 sheet 实现下拉框 | 61 | .registerWriteHandler(new SelectSheetWriteHandler(head)) // 基于固定 sheet 实现下拉框 |
| 45 | - .registerConverter(new LongStringConverter()) // 避免 Long 类型丢失精度 | 62 | + .registerConverter(LONG_STRING_CONVERTER) // 避免 Long 类型丢失精度 |
| 46 | .sheet(sheetName).doWrite(data); | 63 | .sheet(sheetName).doWrite(data); |
| 47 | // 设置 header 和 contentType。写在最后的原因是,避免报错时,响应 contentType 已经被修改了 | 64 | // 设置 header 和 contentType。写在最后的原因是,避免报错时,响应 contentType 已经被修改了 |
| 48 | response.addHeader("Content-Disposition", "attachment;filename=" + HttpUtils.encodeUtf8(filename)); | 65 | response.addHeader("Content-Disposition", "attachment;filename=" + HttpUtils.encodeUtf8(filename)); |
| @@ -62,10 +79,10 @@ public class ExcelUtils { | @@ -62,10 +79,10 @@ public class ExcelUtils { | ||
| 62 | public static void write(HttpServletResponse response, String filename, String sheetName, | 79 | public static void write(HttpServletResponse response, String filename, String sheetName, |
| 63 | List<List<String>> head, List<List<Object>> data) throws IOException { | 80 | List<List<String>> head, List<List<Object>> data) throws IOException { |
| 64 | // 输出 Excel | 81 | // 输出 Excel |
| 65 | - FastExcelFactory.write(response.getOutputStream()) | 82 | + FesodSheet.write(response.getOutputStream()) |
| 66 | .autoCloseStream(false) // 不要自动关闭,交给 Servlet 自己处理 | 83 | .autoCloseStream(false) // 不要自动关闭,交给 Servlet 自己处理 |
| 67 | .registerWriteHandler(new ColumnWidthMatchStyleStrategy()) // 基于 column 长度,自动适配。最大 255 宽度 | 84 | .registerWriteHandler(new ColumnWidthMatchStyleStrategy()) // 基于 column 长度,自动适配。最大 255 宽度 |
| 68 | - .registerConverter(new LongStringConverter()) // 避免 Long 类型丢失精度 | 85 | + .registerConverter(LONG_STRING_CONVERTER) // 避免 Long 类型丢失精度 |
| 69 | .head(head).sheet(sheetName).doWrite(data); | 86 | .head(head).sheet(sheetName).doWrite(data); |
| 70 | // 设置 header 和 contentType。写在最后的原因是,避免报错时,响应 contentType 已经被修改了 | 87 | // 设置 header 和 contentType。写在最后的原因是,避免报错时,响应 contentType 已经被修改了 |
| 71 | response.addHeader("Content-Disposition", "attachment;filename=" + HttpUtils.encodeUtf8(filename)); | 88 | response.addHeader("Content-Disposition", "attachment;filename=" + HttpUtils.encodeUtf8(filename)); |
| @@ -78,7 +95,7 @@ public class ExcelUtils { | @@ -78,7 +95,7 @@ public class ExcelUtils { | ||
| 78 | } | 95 | } |
| 79 | // 参考 https://t.zsxq.com/zM77F 帖子,增加 try 处理,兼容 windows 场景 | 96 | // 参考 https://t.zsxq.com/zM77F 帖子,增加 try 处理,兼容 windows 场景 |
| 80 | try (InputStream inputStream = file.getInputStream()) { | 97 | try (InputStream inputStream = file.getInputStream()) { |
| 81 | - return FastExcelFactory.read(inputStream, head, null) | 98 | + return FesodSheet.read(inputStream, head, null) |
| 82 | .autoCloseStream(false) // 不要自动关闭,交给 Servlet 自己处理 | 99 | .autoCloseStream(false) // 不要自动关闭,交给 Servlet 自己处理 |
| 83 | .doReadAllSync(); | 100 | .doReadAllSync(); |
| 84 | } | 101 | } |
| @@ -101,7 +118,7 @@ public class ExcelUtils { | @@ -101,7 +118,7 @@ public class ExcelUtils { | ||
| 101 | } | 118 | } |
| 102 | List<T> rows = new ArrayList<>(Math.min(maxRowCount, 1024)); | 119 | List<T> rows = new ArrayList<>(Math.min(maxRowCount, 1024)); |
| 103 | try (InputStream inputStream = file.getInputStream()) { | 120 | try (InputStream inputStream = file.getInputStream()) { |
| 104 | - FastExcelFactory.read(inputStream, head, new ReadListener<T>() { | 121 | + FesodSheet.read(inputStream, head, new ReadListener<T>() { |
| 105 | 122 | ||
| 106 | @Override | 123 | @Override |
| 107 | public void invoke(T data, AnalysisContext context) { | 124 | public void invoke(T data, AnalysisContext context) { |
| @@ -136,7 +153,7 @@ public class ExcelUtils { | @@ -136,7 +153,7 @@ public class ExcelUtils { | ||
| 136 | } | 153 | } |
| 137 | // 参考 https://t.zsxq.com/zM77F 帖子,增加 try 处理,兼容 windows 场景 | 154 | // 参考 https://t.zsxq.com/zM77F 帖子,增加 try 处理,兼容 windows 场景 |
| 138 | try (InputStream inputStream = file.getInputStream()) { | 155 | try (InputStream inputStream = file.getInputStream()) { |
| 139 | - return FastExcelFactory.read(inputStream) | 156 | + return FesodSheet.read(inputStream) |
| 140 | .autoCloseStream(false) // 不要自动关闭,交给 Servlet 自己处理 | 157 | .autoCloseStream(false) // 不要自动关闭,交给 Servlet 自己处理 |
| 141 | .headRowNumber(1) | 158 | .headRowNumber(1) |
| 142 | .sheet() | 159 | .sheet() |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/PoiExcelUtils.java
| @@ -27,7 +27,7 @@ import java.util.Collection; | @@ -27,7 +27,7 @@ import java.util.Collection; | ||
| 27 | /** | 27 | /** |
| 28 | * 原生 POI 的 Excel 工具类 | 28 | * 原生 POI 的 Excel 工具类 |
| 29 | * | 29 | * |
| 30 | - * 全局 {@link ExcelUtils}(FastExcel)无法表达单元格锁定、公式、动态列等复杂模板时,各模块基于本类实现自定义 Excel 读写 | 30 | + * 全局 {@link ExcelUtils}(Fesod)无法表达单元格锁定、公式、动态列等复杂模板时,各模块基于本类实现自定义 Excel 读写 |
| 31 | * | 31 | * |
| 32 | * @author 芋道源码 | 32 | * @author 芋道源码 |
| 33 | */ | 33 | */ |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/package-info.java
yudao-framework/yudao-spring-boot-starter-excel/src/test/java/cn/iocoder/yudao/framework/excel/core/convert/MultiDictConvertTest.java
| 1 | package cn.iocoder.yudao.framework.excel.core.convert; | 1 | package cn.iocoder.yudao.framework.excel.core.convert; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.ListUtil; | 3 | import cn.hutool.core.collection.ListUtil; |
| 4 | -import cn.idev.excel.metadata.data.ReadCellData; | ||
| 5 | -import cn.idev.excel.metadata.data.WriteCellData; | ||
| 6 | -import cn.idev.excel.metadata.property.ExcelContentProperty; | ||
| 7 | import cn.iocoder.yudao.framework.common.biz.system.dict.DictDataCommonApi; | 4 | import cn.iocoder.yudao.framework.common.biz.system.dict.DictDataCommonApi; |
| 8 | import cn.iocoder.yudao.framework.common.biz.system.dict.dto.DictDataRespDTO; | 5 | import cn.iocoder.yudao.framework.common.biz.system.dict.dto.DictDataRespDTO; |
| 9 | import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils; | 6 | import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils; |
| 10 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 7 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 11 | import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; | 8 | import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; |
| 9 | +import org.apache.fesod.sheet.metadata.data.ReadCellData; | ||
| 10 | +import org.apache.fesod.sheet.metadata.data.WriteCellData; | ||
| 11 | +import org.apache.fesod.sheet.metadata.property.ExcelContentProperty; | ||
| 12 | import org.junit.jupiter.api.BeforeEach; | 12 | import org.junit.jupiter.api.BeforeEach; |
| 13 | import org.junit.jupiter.api.Test; | 13 | import org.junit.jupiter.api.Test; |
| 14 | import org.mockito.Mock; | 14 | import org.mockito.Mock; |
yudao-framework/yudao-spring-boot-starter-excel/src/test/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtilsTest.java
| 1 | package cn.iocoder.yudao.framework.excel.core.util; | 1 | package cn.iocoder.yudao.framework.excel.core.util; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.FastExcelFactory; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | 3 | +import cn.hutool.core.collection.ListUtil; |
| 4 | +import cn.iocoder.yudao.framework.common.biz.system.dict.DictDataCommonApi; | ||
| 5 | +import cn.iocoder.yudao.framework.common.biz.system.dict.dto.DictDataRespDTO; | ||
| 6 | +import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils; | ||
| 7 | +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | ||
| 8 | +import cn.iocoder.yudao.framework.excel.core.annotations.ExcelColumnSelect; | ||
| 9 | +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | ||
| 10 | +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; | ||
| 11 | +import lombok.Data; | ||
| 12 | +import lombok.experimental.Accessors; | ||
| 13 | +import org.apache.fesod.sheet.FesodSheet; | ||
| 14 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 15 | +import org.apache.poi.ss.usermodel.Cell; | ||
| 16 | +import org.apache.poi.ss.usermodel.CellType; | ||
| 17 | +import org.apache.poi.ss.usermodel.Sheet; | ||
| 18 | +import org.apache.poi.ss.usermodel.Workbook; | ||
| 19 | +import org.apache.poi.ss.usermodel.WorkbookFactory; | ||
| 20 | +import org.junit.jupiter.api.BeforeEach; | ||
| 5 | import org.junit.jupiter.api.Test; | 21 | import org.junit.jupiter.api.Test; |
| 22 | +import org.mockito.Mock; | ||
| 23 | +import org.springframework.mock.web.MockHttpServletResponse; | ||
| 6 | import org.springframework.mock.web.MockMultipartFile; | 24 | import org.springframework.mock.web.MockMultipartFile; |
| 7 | 25 | ||
| 26 | +import java.io.ByteArrayInputStream; | ||
| 8 | import java.io.ByteArrayOutputStream; | 27 | import java.io.ByteArrayOutputStream; |
| 9 | import java.util.Arrays; | 28 | import java.util.Arrays; |
| 29 | +import java.util.Collections; | ||
| 10 | import java.util.List; | 30 | import java.util.List; |
| 11 | 31 | ||
| 32 | +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; | ||
| 12 | import static org.junit.jupiter.api.Assertions.assertEquals; | 33 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 34 | +import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
| 35 | +import static org.mockito.ArgumentMatchers.eq; | ||
| 36 | +import static org.mockito.Mockito.when; | ||
| 13 | 37 | ||
| 14 | /** | 38 | /** |
| 15 | * {@link ExcelUtils} 的单元测试 | 39 | * {@link ExcelUtils} 的单元测试 |
| 16 | * | 40 | * |
| 17 | * @author 芋道源码 | 41 | * @author 芋道源码 |
| 18 | */ | 42 | */ |
| 19 | -public class ExcelUtilsTest { | 43 | +public class ExcelUtilsTest extends BaseMockitoUnitTest { |
| 44 | + | ||
| 45 | + private static final String DICT_TYPE = "test_status"; | ||
| 46 | + | ||
| 47 | + @Mock | ||
| 48 | + private DictDataCommonApi dictDataApi; | ||
| 49 | + | ||
| 50 | + @BeforeEach | ||
| 51 | + public void setUp() { | ||
| 52 | + DictFrameworkUtils.init(dictDataApi); | ||
| 53 | + DictFrameworkUtils.clearCache(); | ||
| 54 | + } | ||
| 55 | + | ||
| 56 | + /** | ||
| 57 | + * 字段未配置 converter 的 Long 编号,需要导出为文本,避免丢失精度 | ||
| 58 | + */ | ||
| 59 | + @Test | ||
| 60 | + public void testWrite_class() throws Exception { | ||
| 61 | + // mock 数据 | ||
| 62 | + mockDictDatas(); | ||
| 63 | + // 准备参数 | ||
| 64 | + MockHttpServletResponse response = new MockHttpServletResponse(); | ||
| 65 | + List<TestUser> list = Arrays.asList( | ||
| 66 | + new TestUser().setId(1981234567890123456L).setAge(18).setStatus(0), | ||
| 67 | + new TestUser().setId(Long.MAX_VALUE).setAge(20).setStatus(1)); | ||
| 68 | + | ||
| 69 | + // 调用 | ||
| 70 | + ExcelUtils.write(response, "用户.xls", "数据", TestUser.class, list); | ||
| 71 | + // 断言 | ||
| 72 | + try (Workbook workbook = WorkbookFactory.create(new ByteArrayInputStream(response.getContentAsByteArray()))) { | ||
| 73 | + Sheet sheet = workbook.getSheet("数据"); | ||
| 74 | + // 断言 Long 编号 | ||
| 75 | + assertStringCell("1981234567890123456", sheet.getRow(1).getCell(0)); | ||
| 76 | + assertStringCell("9223372036854775807", sheet.getRow(2).getCell(0)); | ||
| 77 | + // 断言普通数值 | ||
| 78 | + assertNumericCell(18, sheet.getRow(1).getCell(1)); | ||
| 79 | + assertNumericCell(20, sheet.getRow(2).getCell(1)); | ||
| 80 | + // 断言字典转换 | ||
| 81 | + assertStringCell("开启", sheet.getRow(1).getCell(2)); | ||
| 82 | + assertStringCell("关闭", sheet.getRow(2).getCell(2)); | ||
| 83 | + // 断言下拉框 | ||
| 84 | + assertNotNull(workbook.getSheet("字典sheet")); | ||
| 85 | + assertEquals(1, sheet.getDataValidations().size()); | ||
| 86 | + // 断言列宽 | ||
| 87 | + assertEquals(19 * 256, sheet.getColumnWidth(0)); | ||
| 88 | + } | ||
| 89 | + } | ||
| 90 | + | ||
| 91 | + @Test | ||
| 92 | + public void testWrite_dynamicHead() throws Exception { | ||
| 93 | + // 准备参数 | ||
| 94 | + MockHttpServletResponse response = new MockHttpServletResponse(); | ||
| 95 | + List<List<String>> head = Arrays.asList(Collections.singletonList("编号"), Collections.singletonList("年龄")); | ||
| 96 | + List<List<Object>> list = Arrays.asList( | ||
| 97 | + Arrays.asList(1981234567890123456L, 18), | ||
| 98 | + Arrays.asList(Long.MAX_VALUE, 20)); | ||
| 99 | + | ||
| 100 | + // 调用 | ||
| 101 | + ExcelUtils.write(response, "用户.xls", "数据", head, list); | ||
| 102 | + // 断言 | ||
| 103 | + try (Workbook workbook = WorkbookFactory.create(new ByteArrayInputStream(response.getContentAsByteArray()))) { | ||
| 104 | + Sheet sheet = workbook.getSheet("数据"); | ||
| 105 | + assertStringCell("编号", sheet.getRow(0).getCell(0)); | ||
| 106 | + // 断言 Long 编号 | ||
| 107 | + assertStringCell("1981234567890123456", sheet.getRow(1).getCell(0)); | ||
| 108 | + assertStringCell("9223372036854775807", sheet.getRow(2).getCell(0)); | ||
| 109 | + // 断言普通数值 | ||
| 110 | + assertNumericCell(18, sheet.getRow(1).getCell(1)); | ||
| 111 | + assertNumericCell(20, sheet.getRow(2).getCell(1)); | ||
| 112 | + } | ||
| 113 | + } | ||
| 20 | 114 | ||
| 21 | @Test | 115 | @Test |
| 22 | public void testRead_maxRowCount() throws Exception { | 116 | public void testRead_maxRowCount() throws Exception { |
| 23 | // mock 数据 | 117 | // mock 数据 |
| 24 | ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); | 118 | ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); |
| 25 | - FastExcelFactory.write(outputStream, TestRow.class).sheet().doWrite(Arrays.asList( | 119 | + FesodSheet.write(outputStream, TestRow.class).sheet().doWrite(Arrays.asList( |
| 26 | new TestRow("员工一"), new TestRow("员工二"), new TestRow("员工三"))); | 120 | new TestRow("员工一"), new TestRow("员工二"), new TestRow("员工三"))); |
| 27 | MockMultipartFile file = new MockMultipartFile( | 121 | MockMultipartFile file = new MockMultipartFile( |
| 28 | "file", "employees.xlsx", null, outputStream.toByteArray()); | 122 | "file", "employees.xlsx", null, outputStream.toByteArray()); |
| @@ -36,6 +130,41 @@ public class ExcelUtilsTest { | @@ -36,6 +130,41 @@ public class ExcelUtilsTest { | ||
| 36 | assertEquals("员工二", rows.get(1).getName()); | 130 | assertEquals("员工二", rows.get(1).getName()); |
| 37 | } | 131 | } |
| 38 | 132 | ||
| 133 | + private void mockDictDatas() { | ||
| 134 | + List<DictDataRespDTO> dictDatas = ListUtil.of( | ||
| 135 | + randomPojo(DictDataRespDTO.class, o -> o.setDictType(DICT_TYPE).setValue("0").setLabel("开启")), | ||
| 136 | + randomPojo(DictDataRespDTO.class, o -> o.setDictType(DICT_TYPE).setValue("1").setLabel("关闭")) | ||
| 137 | + ); | ||
| 138 | + when(dictDataApi.getDictDataList(eq(DICT_TYPE))).thenReturn(dictDatas); | ||
| 139 | + } | ||
| 140 | + | ||
| 141 | + private static void assertStringCell(String expected, Cell cell) { | ||
| 142 | + assertEquals(CellType.STRING, cell.getCellType()); | ||
| 143 | + assertEquals(expected, cell.getStringCellValue()); | ||
| 144 | + } | ||
| 145 | + | ||
| 146 | + private static void assertNumericCell(double expected, Cell cell) { | ||
| 147 | + assertEquals(CellType.NUMERIC, cell.getCellType()); | ||
| 148 | + assertEquals(expected, cell.getNumericCellValue()); | ||
| 149 | + } | ||
| 150 | + | ||
| 151 | + @Data | ||
| 152 | + @Accessors(chain = true) | ||
| 153 | + public static class TestUser { | ||
| 154 | + | ||
| 155 | + @ExcelProperty("编号") | ||
| 156 | + private Long id; | ||
| 157 | + | ||
| 158 | + @ExcelProperty("年龄") | ||
| 159 | + private Integer age; | ||
| 160 | + | ||
| 161 | + @ExcelProperty(value = "状态", converter = DictConvert.class) | ||
| 162 | + @DictFormat(DICT_TYPE) | ||
| 163 | + @ExcelColumnSelect(dictType = DICT_TYPE) | ||
| 164 | + private Integer status; | ||
| 165 | + | ||
| 166 | + } | ||
| 167 | + | ||
| 39 | public static class TestRow { | 168 | public static class TestRow { |
| 40 | 169 | ||
| 41 | @ExcelProperty("姓名") | 170 | @ExcelProperty("姓名") |
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionRespVO.java
| 1 | package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression; | 1 | package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 4 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 5 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 6 | 6 | ||
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | 8 |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessRespVO.java
| 1 | package cn.iocoder.yudao.module.crm.controller.admin.business.vo.business; | 1 | package cn.iocoder.yudao.module.crm.controller.admin.business.vo.business; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 8 | import lombok.NoArgsConstructor; | 6 | import lombok.NoArgsConstructor; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.math.BigDecimal; | 10 | import java.math.BigDecimal; |
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueRespVO.java
| @@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.crm.controller.admin.clue.vo; | @@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.crm.controller.admin.clue.vo; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 10 | import lombok.ToString; | 8 | import lombok.ToString; |
| 9 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 10 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 11 | 11 | ||
| 12 | import java.time.LocalDateTime; | 12 | import java.time.LocalDateTime; |
| 13 | 13 |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactRespVO.java
| @@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.crm.controller.admin.contact.vo; | @@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.crm.controller.admin.contact.vo; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 10 | import lombok.ToString; | 8 | import lombok.ToString; |
| 9 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 10 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 11 | 11 | ||
| 12 | import java.time.LocalDateTime; | 12 | import java.time.LocalDateTime; |
| 13 | 13 |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
| 1 | package cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract; | 1 | package cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 8 | import lombok.NoArgsConstructor; | 6 | import lombok.NoArgsConstructor; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.math.BigDecimal; | 10 | import java.math.BigDecimal; |
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportExcelVO.java
| @@ -5,11 +5,11 @@ import cn.iocoder.yudao.framework.excel.core.annotations.ExcelColumnSelect; | @@ -5,11 +5,11 @@ import cn.iocoder.yudao.framework.excel.core.annotations.ExcelColumnSelect; | ||
| 5 | import cn.iocoder.yudao.framework.excel.core.convert.AreaConvert; | 5 | import cn.iocoder.yudao.framework.excel.core.convert.AreaConvert; |
| 6 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 6 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 7 | import cn.iocoder.yudao.module.crm.framework.excel.core.AreaExcelColumnSelectFunction; | 7 | import cn.iocoder.yudao.module.crm.framework.excel.core.AreaExcelColumnSelectFunction; |
| 8 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 9 | import lombok.AllArgsConstructor; | 8 | import lombok.AllArgsConstructor; |
| 10 | import lombok.Builder; | 9 | import lombok.Builder; |
| 11 | import lombok.Data; | 10 | import lombok.Data; |
| 12 | import lombok.NoArgsConstructor; | 11 | import lombok.NoArgsConstructor; |
| 12 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 13 | 13 | ||
| 14 | import static cn.iocoder.yudao.module.crm.enums.DictTypeConstants.*; | 14 | import static cn.iocoder.yudao.module.crm.enums.DictTypeConstants.*; |
| 15 | 15 |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java
| @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer; | @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
| 12 | 12 |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/vo/CrmFollowUpRecordRespVO.java
| @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.crm.controller.admin.followup.vo; | @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.crm.controller.admin.followup.vo; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.module.crm.controller.admin.business.vo.business.CrmBusinessRespVO; | 4 | import cn.iocoder.yudao.module.crm.controller.admin.business.vo.business.CrmBusinessRespVO; |
| 5 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
| 11 | import java.util.List; | 11 | import java.util.List; |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/vo/CrmOperateLogRespVO.java
| 1 | package cn.iocoder.yudao.module.crm.controller.admin.operatelog.vo; | 1 | package cn.iocoder.yudao.module.crm.controller.admin.operatelog.vo; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 5 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 6 | 6 | ||
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | 8 |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/category/CrmProductCategoryListReqVO.java
| 1 | package cn.iocoder.yudao.module.crm.controller.admin.product.vo.category; | 1 | package cn.iocoder.yudao.module.crm.controller.admin.product.vo.category; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 4 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 5 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 6 | 6 | ||
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | 8 |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductRespVO.java
| @@ -4,8 +4,8 @@ import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | @@ -4,8 +4,8 @@ import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | ||
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.crm.dal.dataobject.product.CrmProductCategoryDO; | 5 | import cn.iocoder.yudao.module.crm.dal.dataobject.product.CrmProductCategoryDO; |
| 6 | import cn.iocoder.yudao.module.crm.enums.DictTypeConstants; | 6 | import cn.iocoder.yudao.module.crm.enums.DictTypeConstants; |
| 7 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 8 | -import cn.idev.excel.annotation.ExcelProperty; | 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | import org.dromara.core.trans.anno.Trans; | 9 | import org.dromara.core.trans.anno.Trans; |
| 10 | import org.dromara.core.trans.constant.TransType; | 10 | import org.dromara.core.trans.constant.TransType; |
| 11 | import org.dromara.core.trans.vo.VO; | 11 | import org.dromara.core.trans.vo.VO; |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/plan/CrmReceivablePlanRespVO.java
| 1 | package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.plan; | 1 | package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.plan; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.receivable.CrmReceivableRespVO; | 3 | import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.receivable.CrmReceivableRespVO; |
| 4 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 5 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 6 | import io.swagger.v3.oas.annotations.media.Schema; | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivableRespVO.java
| @@ -4,10 +4,10 @@ import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | @@ -4,10 +4,10 @@ import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | ||
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractRespVO; | 5 | import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractRespVO; |
| 6 | import cn.iocoder.yudao.module.crm.enums.DictTypeConstants; | 6 | import cn.iocoder.yudao.module.crm.enums.DictTypeConstants; |
| 7 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 8 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 9 | import io.swagger.v3.oas.annotations.media.Schema; | 7 | import io.swagger.v3.oas.annotations.media.Schema; |
| 10 | import lombok.Data; | 8 | import lombok.Data; |
| 9 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 10 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 11 | 11 | ||
| 12 | import java.math.BigDecimal; | 12 | import java.math.BigDecimal; |
| 13 | import java.time.LocalDateTime; | 13 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountRespVO.java
| @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.finance.vo.account; | @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.finance.vo.account; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; | 4 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; |
| 5 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
| 11 | 11 |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import jakarta.validation.constraints.NotNull; | 4 | import jakarta.validation.constraints.NotNull; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.finance.vo.receipt; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.finance.vo.receipt; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import jakarta.validation.constraints.NotNull; | 4 | import jakarta.validation.constraints.NotNull; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/category/ErpProductCategoryRespVO.java
| @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.product.vo.category; | @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.product.vo.category; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
| 12 | 12 |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.product.vo.product; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.product.vo.product; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 6 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 7 | 7 | ||
| 8 | import java.math.BigDecimal; | 8 | import java.math.BigDecimal; |
| 9 | import java.time.LocalDateTime; | 9 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitRespVO.java
| @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.product.vo.unit; | @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.product.vo.unit; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; | 4 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; |
| 5 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
| 11 | 11 |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import jakarta.validation.constraints.NotNull; | 4 | import jakarta.validation.constraints.NotNull; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import jakarta.validation.constraints.NotNull; | 4 | import jakarta.validation.constraints.NotNull; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import jakarta.validation.constraints.NotNull; | 4 | import jakarta.validation.constraints.NotNull; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierRespVO.java
| @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier; | @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.supplier; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.math.BigDecimal; | 11 | import java.math.BigDecimal; |
| 12 | import java.time.LocalDateTime; | 12 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/customer/ErpCustomerRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.sale.vo.customer; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.sale.vo.customer; |
| 2 | 2 | ||
| 3 | +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | ||
| 4 | +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | ||
| 3 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 4 | import lombok.*; | 6 | import lombok.*; |
| 7 | +import org.apache.fesod.sheet.annotation.*; | ||
| 8 | + | ||
| 5 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 6 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
| 7 | -import cn.idev.excel.annotation.*; | ||
| 8 | -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | ||
| 9 | -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | ||
| 10 | 11 | ||
| 11 | @Schema(description = "管理后台 - ERP 客户 Response VO") | 12 | @Schema(description = "管理后台 - ERP 客户 Response VO") |
| 12 | @Data | 13 | @Data |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import jakarta.validation.constraints.NotNull; | 4 | import jakarta.validation.constraints.NotNull; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/out/ErpSaleOutRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.sale.vo.out; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.sale.vo.out; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import jakarta.validation.constraints.NotNull; | 4 | import jakarta.validation.constraints.NotNull; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.sale.vo.returns; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.sale.vo.returns; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import jakarta.validation.constraints.NotNull; | 4 | import jakarta.validation.constraints.NotNull; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/check/ErpStockCheckRespVO.java
| @@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check; | @@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import jakarta.validation.constraints.NotNull; | 6 | import jakarta.validation.constraints.NotNull; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.math.BigDecimal; | 11 | import java.math.BigDecimal; |
| 12 | import java.time.LocalDateTime; | 12 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInRespVO.java
| @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in; | @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.math.BigDecimal; | 10 | import java.math.BigDecimal; |
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/move/ErpStockMoveRespVO.java
| @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.move; | @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.move; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.math.BigDecimal; | 10 | import java.math.BigDecimal; |
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/out/ErpStockOutRespVO.java
| @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.out; | @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.out; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.math.BigDecimal; | 10 | import java.math.BigDecimal; |
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordRespVO.java
| @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.record; | @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.record; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.erp.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.erp.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.math.BigDecimal; | 11 | import java.math.BigDecimal; |
| 12 | import java.time.LocalDateTime; | 12 | import java.time.LocalDateTime; |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/stock/ErpStockRespVO.java
| 1 | package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.stock; | 1 | package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.stock; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 6 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 7 | 7 | ||
| 8 | import java.math.BigDecimal; | 8 | import java.math.BigDecimal; |
| 9 | 9 |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/warehouse/ErpWarehouseRespVO.java
| @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse; | @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.math.BigDecimal; | 11 | import java.math.BigDecimal; |
| 12 | import java.time.LocalDateTime; | 12 | import java.time.LocalDateTime; |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/config/vo/auxiliaryitem/FmsAuxiliaryItemImportExcelVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.config.vo.auxiliaryitem; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.config.vo.auxiliaryitem; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 4 | import jakarta.validation.constraints.NotBlank; | 3 | import jakarta.validation.constraints.NotBlank; |
| 5 | import jakarta.validation.constraints.Size; | 4 | import jakarta.validation.constraints.Size; |
| 6 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 7 | 7 | ||
| 8 | /** | 8 | /** |
| 9 | * FMS 辅助核算项目 Excel 导入 VO | 9 | * FMS 辅助核算项目 Excel 导入 VO |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/config/vo/auxiliaryitem/FmsAuxiliaryItemRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.config.vo.auxiliaryitem; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.config.vo.auxiliaryitem; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 6 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 7 | 7 | ||
| 8 | import java.time.LocalDateTime; | 8 | import java.time.LocalDateTime; |
| 9 | 9 |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/config/vo/initialbalance/FmsInitialBalanceExcelVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.config.vo.initialbalance; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.config.vo.initialbalance; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 5 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 6 | 6 | ||
| 7 | import java.math.BigDecimal; | 7 | import java.math.BigDecimal; |
| 8 | 8 |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/config/vo/subject/FmsSubjectImportExcelVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.config.vo.subject; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.config.vo.subject; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 4 | import jakarta.validation.constraints.NotBlank; | 3 | import jakarta.validation.constraints.NotBlank; |
| 5 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
| 6 | import lombok.Builder; | 5 | import lombok.Builder; |
| 7 | import lombok.Data; | 6 | import lombok.Data; |
| 8 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | /** | 10 | /** |
| 11 | * FMS 科目 Excel 导入 VO | 11 | * FMS 科目 Excel 导入 VO |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/config/vo/subject/FmsSubjectRespVO.java
| @@ -4,11 +4,11 @@ import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | @@ -4,11 +4,11 @@ import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | ||
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.framework.excel.core.convert.StringListConvert; | 5 | import cn.iocoder.yudao.framework.excel.core.convert.StringListConvert; |
| 6 | import cn.iocoder.yudao.module.fms.enums.DictTypeConstants; | 6 | import cn.iocoder.yudao.module.fms.enums.DictTypeConstants; |
| 7 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 8 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 9 | import com.fasterxml.jackson.annotation.JsonIgnore; | 7 | import com.fasterxml.jackson.annotation.JsonIgnore; |
| 10 | import io.swagger.v3.oas.annotations.media.Schema; | 8 | import io.swagger.v3.oas.annotations.media.Schema; |
| 11 | import lombok.Data; | 9 | import lombok.Data; |
| 10 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 11 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 12 | 12 | ||
| 13 | import java.time.LocalDateTime; | 13 | import java.time.LocalDateTime; |
| 14 | import java.util.List; | 14 | import java.util.List; |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/ledger/vo/auxiliarybalance/FmsLedgerAuxiliaryBalanceRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.auxiliarybalance; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.auxiliarybalance; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 4 | import lombok.Data; |
| 7 | import lombok.experimental.Accessors; | 5 | import lombok.experimental.Accessors; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | 10 |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/ledger/vo/auxiliarydetail/FmsLedgerAuxiliaryDetailRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.auxiliarydetail; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.auxiliarydetail; |
| 2 | 2 | ||
| 3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
| 4 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 5 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 6 | import io.swagger.v3.oas.annotations.media.Schema; | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDate; | 10 | import java.time.LocalDate; |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/ledger/vo/detail/FmsLedgerDetailExportRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.detail; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.detail; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 5 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 6 | 6 | ||
| 7 | import java.math.BigDecimal; | 7 | import java.math.BigDecimal; |
| 8 | import java.time.LocalDate; | 8 | import java.time.LocalDate; |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/ledger/vo/detail/FmsLedgerDetailRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.detail; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.detail; |
| 2 | 2 | ||
| 3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
| 4 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 5 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 6 | import io.swagger.v3.oas.annotations.media.Schema; | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDate; | 10 | import java.time.LocalDate; |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/ledger/vo/general/FmsLedgerGeneralRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.general; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.general; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 6 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 7 | 7 | ||
| 8 | import java.math.BigDecimal; | 8 | import java.math.BigDecimal; |
| 9 | 9 |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/ledger/vo/quantitydetail/FmsLedgerQuantityDetailRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.quantitydetail; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.quantitydetail; |
| 2 | 2 | ||
| 3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
| 4 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 5 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 6 | import io.swagger.v3.oas.annotations.media.Schema; | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDate; | 10 | import java.time.LocalDate; |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/ledger/vo/quantitygeneral/FmsLedgerQuantityGeneralRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.quantitygeneral; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.quantitygeneral; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnore; | ||
| 4 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 5 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 6 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnore; | ||
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.util.ArrayList; | 10 | import java.util.ArrayList; |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/ledger/vo/subjectbalance/FmsLedgerSubjectBalanceRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.subjectbalance; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.ledger.vo.subjectbalance; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 4 | import lombok.Data; |
| 7 | import lombok.experimental.Accessors; | 5 | import lombok.experimental.Accessors; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.util.ArrayList; | 10 | import java.util.ArrayList; |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/report/vo/FmsReportItemRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.report.vo; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.report.vo; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 6 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 7 | 7 | ||
| 8 | import java.math.BigDecimal; | 8 | import java.math.BigDecimal; |
| 9 | 9 |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/report/vo/balance/FmsBalanceSheetRowRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.report.vo.balance; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.report.vo.balance; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 6 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 7 | 7 | ||
| 8 | import java.math.BigDecimal; | 8 | import java.math.BigDecimal; |
| 9 | 9 |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/voucher/vo/FmsVoucherExportRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.voucher.vo; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.voucher.vo; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | -import cn.idev.excel.annotation.format.DateTimeFormat; | ||
| 6 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 6 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 7 | +import org.apache.fesod.sheet.annotation.format.DateTimeFormat; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
yudao-module-fms/src/main/java/cn/iocoder/yudao/module/fms/controller/admin/voucher/vo/FmsVoucherStatisticsRespVO.java
| 1 | package cn.iocoder.yudao.module.fms.controller.admin.voucher.vo; | 1 | package cn.iocoder.yudao.module.fms.controller.admin.voucher.vo; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 6 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 7 | 7 | ||
| 8 | import java.math.BigDecimal; | 8 | import java.math.BigDecimal; |
| 9 | 9 |
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/clock/HrmAttendanceClockRespVO.java
| 1 | package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.clock; | 1 | package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.clock; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 6 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 7 | import cn.iocoder.yudao.module.hrm.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.hrm.enums.DictTypeConstants; |
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.math.BigDecimal; | 11 | import java.math.BigDecimal; |
| 12 | import java.time.LocalDateTime; | 12 | import java.time.LocalDateTime; |
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/leave/HrmAttendanceLeaveRespVO.java
| 1 | package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.leave; | 1 | package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.leave; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 6 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 7 | import cn.iocoder.yudao.module.hrm.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.hrm.enums.DictTypeConstants; |
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.math.BigDecimal; | 11 | import java.math.BigDecimal; |
| 12 | import java.time.LocalDateTime; | 12 | import java.time.LocalDateTime; |
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/statistics/HrmAttendanceDailyDetailRespVO.java
| 1 | package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.statistics; | 1 | package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.statistics; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.clock.HrmAttendanceClockRespVO; | 3 | import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.clock.HrmAttendanceClockRespVO; |
| 6 | import io.swagger.v3.oas.annotations.media.Schema; | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 7 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 8 | 8 | ||
| 9 | import java.math.BigDecimal; | 9 | import java.math.BigDecimal; |
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/statistics/HrmAttendanceMonthRecordRespVO.java
| 1 | package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.statistics; | 1 | package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.statistics; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 6 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 7 | 7 | ||
| 8 | import java.math.BigDecimal; | 8 | import java.math.BigDecimal; |
| 9 | import java.time.LocalDateTime; | 9 | import java.time.LocalDateTime; |
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/employee/HrmEmployeeImportExcelVO.java
| 1 | package cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.employee; | 1 | package cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.employee; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import cn.iocoder.yudao.framework.excel.core.annotations.ExcelColumnSelect; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.ExcelColumnSelect; |
| 6 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 4 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 7 | import cn.iocoder.yudao.framework.excel.core.convert.AreaConvert; | 5 | import cn.iocoder.yudao.framework.excel.core.convert.AreaConvert; |
| @@ -14,6 +12,8 @@ import lombok.AllArgsConstructor; | @@ -14,6 +12,8 @@ import lombok.AllArgsConstructor; | ||
| 14 | import lombok.Builder; | 12 | import lombok.Builder; |
| 15 | import lombok.Data; | 13 | import lombok.Data; |
| 16 | import lombok.NoArgsConstructor; | 14 | import lombok.NoArgsConstructor; |
| 15 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 16 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 17 | 17 | ||
| 18 | import java.time.LocalDateTime; | 18 | import java.time.LocalDateTime; |
| 19 | 19 |
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/employee/HrmEmployeeRespVO.java
| @@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.employee; | @@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.employee; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.hrm.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.hrm.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 10 | import lombok.experimental.Accessors; | 8 | import lombok.experimental.Accessors; |
| 9 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 10 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 11 | 11 | ||
| 12 | import java.time.LocalDateTime; | 12 | import java.time.LocalDateTime; |
| 13 | 13 |
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/changerecord/HrmSalaryChangeRecordRespVO.java
| 1 | package cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.changerecord; | 1 | package cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.changerecord; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 6 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 7 | import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.option.HrmSalaryOptionValueVO; | 5 | import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.option.HrmSalaryOptionValueVO; |
| 8 | import cn.iocoder.yudao.module.hrm.enums.DictTypeConstants; | 6 | import cn.iocoder.yudao.module.hrm.enums.DictTypeConstants; |
| 9 | import io.swagger.v3.oas.annotations.media.Schema; | 7 | import io.swagger.v3.oas.annotations.media.Schema; |
| 10 | import lombok.Data; | 8 | import lombok.Data; |
| 9 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 10 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 11 | 11 | ||
| 12 | import java.math.BigDecimal; | 12 | import java.math.BigDecimal; |
| 13 | import java.time.LocalDateTime; | 13 | import java.time.LocalDateTime; |
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/employeeinfo/HrmSalaryEmployeeInfoRespVO.java
| 1 | package cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.employeeinfo; | 1 | package cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.employeeinfo; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 6 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 7 | import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.option.HrmSalaryOptionValueVO; | 5 | import cn.iocoder.yudao.module.hrm.controller.admin.salary.vo.option.HrmSalaryOptionValueVO; |
| 8 | import cn.iocoder.yudao.module.hrm.enums.DictTypeConstants; | 6 | import cn.iocoder.yudao.module.hrm.enums.DictTypeConstants; |
| 9 | import io.swagger.v3.oas.annotations.media.Schema; | 7 | import io.swagger.v3.oas.annotations.media.Schema; |
| 10 | import lombok.Data; | 8 | import lombok.Data; |
| 9 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 10 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 11 | 11 | ||
| 12 | import java.math.BigDecimal; | 12 | import java.math.BigDecimal; |
| 13 | import java.time.LocalDateTime; | 13 | import java.time.LocalDateTime; |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigRespVO.java
| @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.config.vo; | @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.config.vo; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
| 12 | 12 |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/vo/Demo01ContactRespVO.java
| @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.demo01.vo; | @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.demo01.vo; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
| 11 | 11 |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java
| 1 | package cn.iocoder.yudao.module.infra.controller.admin.demo.demo02.vo; | 1 | package cn.iocoder.yudao.module.infra.controller.admin.demo.demo02.vo; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 6 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 7 | 7 | ||
| 8 | import java.time.LocalDateTime; | 8 | import java.time.LocalDateTime; |
| 9 | 9 |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/erp/vo/Demo03StudentErpRespVO.java
| @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.demo03.erp.vo; | @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.demo03.erp.vo; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
| 11 | 11 |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerRespVO.java
| @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.demo03.inner.vo; | @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.demo03.inner.vo; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
| 11 | 11 |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/normal/vo/Demo03StudentNormalRespVO.java
| @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.demo03.normal.vo; | @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.demo03.normal.vo; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 8 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 9 | 9 | ||
| 10 | import java.time.LocalDateTime; | 10 | import java.time.LocalDateTime; |
| 11 | 11 |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobRespVO.java
| @@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.infra.controller.admin.job.vo.job; | @@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.infra.controller.admin.job.vo.job; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import jakarta.validation.constraints.NotNull; | 7 | import jakarta.validation.constraints.NotNull; |
| 10 | import lombok.Data; | 8 | import lombok.Data; |
| 9 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 10 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 11 | 11 | ||
| 12 | import java.time.LocalDateTime; | 12 | import java.time.LocalDateTime; |
| 13 | 13 |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/JobLogRespVO.java
| @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.job.vo.log; | @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.job.vo.log; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
| 12 | 12 |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java
| @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog; | @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
| 12 | 12 |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java
| @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog; | @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog; | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; | 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 7 | -import cn.idev.excel.annotation.ExcelProperty; | ||
| 8 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 9 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; | ||
| 9 | +import org.apache.fesod.sheet.annotation.ExcelProperty; | ||
| 10 | 10 | ||
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
| 12 | 12 |
yudao-module-infra/src/main/resources/codegen/java/controller/vo/importExcelVO.vm
| 1 | package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo; | 1 | package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelProperty; | 3 | +import org.apache.fesod.sheet.annotation.ExcelProperty; |
| 4 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
| 5 | import lombok.Builder; | 5 | import lombok.Builder; |
| 6 | import lombok.Data; | 6 | import lombok.Data; |
yudao-module-infra/src/main/resources/codegen/java/controller/vo/respVO.vm
| @@ -19,7 +19,7 @@ import java.time.LocalDateTime; | @@ -19,7 +19,7 @@ import java.time.LocalDateTime; | ||
| 19 | #end | 19 | #end |
| 20 | #end | 20 | #end |
| 21 | ## 处理 Excel 导出 | 21 | ## 处理 Excel 导出 |
| 22 | -import cn.idev.excel.annotation.*; | 22 | +import org.apache.fesod.sheet.annotation.*; |
| 23 | #foreach ($column in $columns) | 23 | #foreach ($column in $columns) |
| 24 | #if ("$!column.dictType" != "")## 有设置数据字典 | 24 | #if ("$!column.dictType" != "")## 有设置数据字典 |
| 25 | import ${DictFormatClassName}; | 25 | import ${DictFormatClassName}; |
yudao-module-infra/src/main/resources/codegen/java/dal/do.vm
| @@ -15,7 +15,7 @@ import ${BaseDOClassName}; | @@ -15,7 +15,7 @@ import ${BaseDOClassName}; | ||
| 15 | ## 处理 Excel 导出 + Schema 注解(仅 DO 模式) | 15 | ## 处理 Excel 导出 + Schema 注解(仅 DO 模式) |
| 16 | #if ($voType == 20) | 16 | #if ($voType == 20) |
| 17 | import io.swagger.v3.oas.annotations.media.Schema; | 17 | import io.swagger.v3.oas.annotations.media.Schema; |
| 18 | -import cn.idev.excel.annotation.*; | 18 | +import org.apache.fesod.sheet.annotation.*; |
| 19 | #foreach ($column in $columns) | 19 | #foreach ($column in $columns) |
| 20 | #if ("$!column.dictType" != "")## 有设置数据字典 | 20 | #if ("$!column.dictType" != "")## 有设置数据字典 |
| 21 | import ${DictFormatClassName}; | 21 | import ${DictFormatClassName}; |
yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentRespVO
| @@ -5,7 +5,7 @@ import lombok.*; | @@ -5,7 +5,7 @@ import lombok.*; | ||
| 5 | import java.util.*; | 5 | import java.util.*; |
| 6 | import org.springframework.format.annotation.DateTimeFormat; | 6 | import org.springframework.format.annotation.DateTimeFormat; |
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | -import cn.idev.excel.annotation.*; | 8 | +import org.apache.fesod.sheet.annotation.*; |
| 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 11 | 11 |
yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentRespVO
| @@ -5,7 +5,7 @@ import lombok.*; | @@ -5,7 +5,7 @@ import lombok.*; | ||
| 5 | import java.util.*; | 5 | import java.util.*; |
| 6 | import org.springframework.format.annotation.DateTimeFormat; | 6 | import org.springframework.format.annotation.DateTimeFormat; |
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | -import cn.idev.excel.annotation.*; | 8 | +import org.apache.fesod.sheet.annotation.*; |
| 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 11 | 11 |
yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentRespVO
| @@ -5,7 +5,7 @@ import lombok.*; | @@ -5,7 +5,7 @@ import lombok.*; | ||
| 5 | import java.util.*; | 5 | import java.util.*; |
| 6 | import org.springframework.format.annotation.DateTimeFormat; | 6 | import org.springframework.format.annotation.DateTimeFormat; |
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | -import cn.idev.excel.annotation.*; | 8 | +import org.apache.fesod.sheet.annotation.*; |
| 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 11 | 11 |
yudao-module-infra/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentRespVO
| @@ -5,7 +5,7 @@ import lombok.*; | @@ -5,7 +5,7 @@ import lombok.*; | ||
| 5 | import java.util.*; | 5 | import java.util.*; |
| 6 | import org.springframework.format.annotation.DateTimeFormat; | 6 | import org.springframework.format.annotation.DateTimeFormat; |
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | -import cn.idev.excel.annotation.*; | 8 | +import org.apache.fesod.sheet.annotation.*; |
| 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 11 | 11 |
yudao-module-infra/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentImportExcelVO
| 1 | package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; | 1 | package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelProperty; | 3 | +import org.apache.fesod.sheet.annotation.ExcelProperty; |
| 4 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
| 5 | import lombok.Builder; | 5 | import lombok.Builder; |
| 6 | import lombok.Data; | 6 | import lombok.Data; |
yudao-module-infra/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentRespVO
| @@ -5,7 +5,7 @@ import lombok.*; | @@ -5,7 +5,7 @@ import lombok.*; | ||
| 5 | import java.util.*; | 5 | import java.util.*; |
| 6 | import org.springframework.format.annotation.DateTimeFormat; | 6 | import org.springframework.format.annotation.DateTimeFormat; |
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | -import cn.idev.excel.annotation.*; | 8 | +import org.apache.fesod.sheet.annotation.*; |
| 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 11 | 11 |
yudao-module-infra/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryRespVO
| @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; | @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; | ||
| 3 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
| 4 | import lombok.*; | 4 | import lombok.*; |
| 5 | import java.util.*; | 5 | import java.util.*; |
| 6 | -import cn.idev.excel.annotation.*; | 6 | +import org.apache.fesod.sheet.annotation.*; |
| 7 | 7 | ||
| 8 | @Schema(description = "管理后台 - 分类 Response VO") | 8 | @Schema(description = "管理后台 - 分类 Response VO") |
| 9 | @Data | 9 | @Data |
yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentRespVO
| @@ -5,7 +5,7 @@ import lombok.*; | @@ -5,7 +5,7 @@ import lombok.*; | ||
| 5 | import java.util.*; | 5 | import java.util.*; |
| 6 | import org.springframework.format.annotation.DateTimeFormat; | 6 | import org.springframework.format.annotation.DateTimeFormat; |
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | -import cn.idev.excel.annotation.*; | 8 | +import org.apache.fesod.sheet.annotation.*; |
| 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 11 | 11 |
yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentRespVO
| @@ -5,7 +5,7 @@ import lombok.*; | @@ -5,7 +5,7 @@ import lombok.*; | ||
| 5 | import java.util.*; | 5 | import java.util.*; |
| 6 | import org.springframework.format.annotation.DateTimeFormat; | 6 | import org.springframework.format.annotation.DateTimeFormat; |
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | -import cn.idev.excel.annotation.*; | 8 | +import org.apache.fesod.sheet.annotation.*; |
| 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 11 | 11 |
yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentRespVO
| @@ -5,7 +5,7 @@ import lombok.*; | @@ -5,7 +5,7 @@ import lombok.*; | ||
| 5 | import java.util.*; | 5 | import java.util.*; |
| 6 | import org.springframework.format.annotation.DateTimeFormat; | 6 | import org.springframework.format.annotation.DateTimeFormat; |
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | -import cn.idev.excel.annotation.*; | 8 | +import org.apache.fesod.sheet.annotation.*; |
| 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 11 | 11 |
yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentImportExcelVO
| 1 | package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; | 1 | package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelProperty; | 3 | +import org.apache.fesod.sheet.annotation.ExcelProperty; |
| 4 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
| 5 | import lombok.Builder; | 5 | import lombok.Builder; |
| 6 | import lombok.Data; | 6 | import lombok.Data; |
yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentRespVO
| @@ -5,7 +5,7 @@ import lombok.*; | @@ -5,7 +5,7 @@ import lombok.*; | ||
| 5 | import java.util.*; | 5 | import java.util.*; |
| 6 | import org.springframework.format.annotation.DateTimeFormat; | 6 | import org.springframework.format.annotation.DateTimeFormat; |
| 7 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
| 8 | -import cn.idev.excel.annotation.*; | 8 | +import org.apache.fesod.sheet.annotation.*; |
| 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 9 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 10 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 11 | 11 |
yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentImportExcelVO
| 1 | package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; | 1 | package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; |
| 2 | 2 | ||
| 3 | -import cn.idev.excel.annotation.ExcelProperty; | 3 | +import org.apache.fesod.sheet.annotation.ExcelProperty; |
| 4 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
| 5 | import lombok.Builder; | 5 | import lombok.Builder; |
| 6 | import lombok.Data; | 6 | import lombok.Data; |