فهرست منبع

fix:
easyExcel日期导出格式问题

18339543638 2 سال پیش
والد
کامیت
daeb071e37

+ 5 - 2
tr-modules-api/tr-module-export-api/src/main/java/cn/tr/module/export/handler/AbstractCascadeSelectConverter.java

@@ -63,7 +63,7 @@ public abstract class AbstractCascadeSelectConverter<T> implements Converter<T>
         //java 转execl,java中填写的是key值,填写value(key)放入execl中
         ExcelPropertySupport excelPropertySupport = contentProperty.getField().getAnnotation(ExcelPropertySupport.class);
         if(excelPropertySupport!=null){
-            cellData.setStringValue(javaConverterExcelCellValue(value,getSelectPairs(getParams(excelPropertySupport))));
+            cellData.setStringValue(javaConverterExcelCellValue(value,getSelectPairs(getParams(excelPropertySupport)),excelPropertySupport.select()));
         }
         return cellData;
     }
@@ -160,7 +160,7 @@ public abstract class AbstractCascadeSelectConverter<T> implements Converter<T>
      * @param selectValues 选择框键值对
      * @return
      */
-    public String javaConverterExcelCellValue(T value,List<Pair<String, String>> selectValues){
+    public String javaConverterExcelCellValue(T value,List<Pair<String, String>> selectValues,ExcelSelect excelSelect){
         if(ObjectUtil.isNull(value)){
             return "";
         }
@@ -169,6 +169,9 @@ public abstract class AbstractCascadeSelectConverter<T> implements Converter<T>
                 return pair.getValue();
             }
         }
+        if(excelSelect!=null&&excelSelect.allowCustom()){
+            return String.valueOf(value);
+        }
         return null;
     };