From fbbbf12abcdcc6d574ee7eb695da3e24b08ee6bb Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 27 Aug 2025 17:59:18 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B4=AD=E4=B9=B0=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=9F=A5=E8=AF=A2=EF=BC=9B2=E3=80=81EnumConv?=
 =?UTF-8?q?ert=E7=BC=96=E8=AF=91=E4=BF=AE=E5=A4=8D=EF=BC=9B3=E3=80=81?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E8=A1=A5=E5=85=85=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cf/imes/framework/excel/core/convert/EnumConvert.java   | 6 +++---
 .../admin/funds/invoice/vo/InvoiceRecordsRespVO.java        | 2 ++
 .../dal/mysql/funds/purchase/PurchaseRecordMapper.java      | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

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<Integer> {
         if (code == null) {
             return new WriteCellData<>("");
         }
-        Class<? extends Enum<?>> enumClass = getEnumClass(context.getContentProperty().getField());
+        Class<? extends Enum> 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<Integer> {
         if (desc == null) {
             return null;
         }
-        Class<? extends Enum<?>> enumClass = getEnumClass(context.getContentProperty().getField());
+        Class<? extends Enum> 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<Integer> {
         return null;
     }
 
-    private Class<? extends Enum<?>> getEnumClass(Field field) {
+    private Class<? extends Enum> 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<PurchaseRecordDO> {
                 .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));
 
     }