diff --git a/cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/excel/core/convert/EnumConvert.java b/cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/excel/core/convert/EnumConvert.java index 53844f790..3a320d3ab 100644 --- a/cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/excel/core/convert/EnumConvert.java +++ b/cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/excel/core/convert/EnumConvert.java @@ -35,7 +35,7 @@ public class EnumConvert implements Converter { if (code == null) { return new WriteCellData<>(""); } - Class> enumClass = getEnumClass(context.getContentProperty().getField()); + Class enumClass = getEnumClass(context.getContentProperty().getField()); if (enumClass != null) { for (Object e : enumClass.getEnumConstants()) { BaseEnum baseEnum = (BaseEnum) e; @@ -54,7 +54,7 @@ public class EnumConvert implements Converter { if (desc == null) { return null; } - Class> enumClass = getEnumClass(context.getContentProperty().getField()); + Class enumClass = getEnumClass(context.getContentProperty().getField()); if (enumClass != null) { for (Object e : enumClass.getEnumConstants()) { BaseEnum baseEnum = (BaseEnum) e; @@ -66,7 +66,7 @@ public class EnumConvert implements Converter { return null; } - private Class> getEnumClass(Field field) { + private Class getEnumClass(Field field) { EnumFormat annotation = field.getAnnotation(EnumFormat.class); return annotation != null ? annotation.value() : null; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceRecordsRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceRecordsRespVO.java index 2149e3a9f..4f9320685 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceRecordsRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceRecordsRespVO.java @@ -59,6 +59,8 @@ public class InvoiceRecordsRespVO { @Schema(description = "开票时间") private LocalDateTime invoiceTime; + @Schema(description = "申请时间") + private LocalDateTime createTime; @Schema(description = "备注") private String remark; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java index 7b278d42e..f876dfea3 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java @@ -42,7 +42,8 @@ public interface PurchaseRecordMapper extends BaseMapperX { .likeIfPresent(PurchaseRecordDO::getProductName, pageReqVO.getProductName()) .eqIfPresent(PurchaseRecordDO::getPurchaseDuration, pageReqVO.getPurchaseDuration()) .betweenIfPresent(PurchaseRecordDO::getCreateTime, pageReqVO.getCreateTime()) - .likeIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getCreator())); + .likeIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getCreator()) + .orderByDesc(PurchaseRecordDO::getCreateTime)); }