1、购买记录倒序查询;2、EnumConvert编译修复;3、开票申请补充创建时间;

This commit is contained in:
gaoqr
2025-08-27 17:59:18 +08:00
parent 3680bf0db1
commit fbbbf12abc
3 changed files with 7 additions and 4 deletions
@@ -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;
}
@@ -59,6 +59,8 @@ public class InvoiceRecordsRespVO {
@Schema(description = "开票时间")
private LocalDateTime invoiceTime;
@Schema(description = "申请时间")
private LocalDateTime createTime;
@Schema(description = "备注")
private String remark;
@@ -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));
}