mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
1、购买记录倒序查询;2、EnumConvert编译修复;3、开票申请补充创建时间;
This commit is contained in:
+3
-3
@@ -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;
|
||||
}
|
||||
|
||||
+2
@@ -59,6 +59,8 @@ public class InvoiceRecordsRespVO {
|
||||
@Schema(description = "开票时间")
|
||||
private LocalDateTime invoiceTime;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
+2
-1
@@ -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));
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user