Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/excel/core/convert/EnumConvert.java
+3 -3
View File
@@ -35,7 +35,7 @@ public class EnumConvert implements Converter<Integer> {
if (code == null) { if (code == null) {
return new WriteCellData<>(""); return new WriteCellData<>("");
} }
Class<? extends Enum<?>> enumClass = getEnumClass(context.getContentProperty().getField()); Class<? extends Enum> enumClass = getEnumClass(context.getContentProperty().getField());
if (enumClass != null) { if (enumClass != null) {
for (Object e : enumClass.getEnumConstants()) { for (Object e : enumClass.getEnumConstants()) {
BaseEnum baseEnum = (BaseEnum) e; BaseEnum baseEnum = (BaseEnum) e;
@@ -54,7 +54,7 @@ public class EnumConvert implements Converter<Integer> {
if (desc == null) { if (desc == null) {
return null; return null;
} }
Class<? extends Enum<?>> enumClass = getEnumClass(context.getContentProperty().getField()); Class<? extends Enum> enumClass = getEnumClass(context.getContentProperty().getField());
if (enumClass != null) { if (enumClass != null) {
for (Object e : enumClass.getEnumConstants()) { for (Object e : enumClass.getEnumConstants()) {
BaseEnum baseEnum = (BaseEnum) e; BaseEnum baseEnum = (BaseEnum) e;
@@ -66,7 +66,7 @@ public class EnumConvert implements Converter<Integer> {
return null; return null;
} }
private Class<? extends Enum<?>> getEnumClass(Field field) { private Class<? extends Enum> getEnumClass(Field field) {
EnumFormat annotation = field.getAnnotation(EnumFormat.class); EnumFormat annotation = field.getAnnotation(EnumFormat.class);
return annotation != null ? annotation.value() : null; return annotation != null ? annotation.value() : null;
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceRecordsRespVO.java
+2
View File
@@ -59,6 +59,8 @@ public class InvoiceRecordsRespVO {
@Schema(description = "开票时间") @Schema(description = "开票时间")
private LocalDateTime invoiceTime; private LocalDateTime invoiceTime;
@Schema(description = "申请时间")
private LocalDateTime createTime;
@Schema(description = "备注") @Schema(description = "备注")
private String remark; private String remark;
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java
+2 -1
View File
@@ -42,7 +42,8 @@ public interface PurchaseRecordMapper extends BaseMapperX<PurchaseRecordDO> {
.likeIfPresent(PurchaseRecordDO::getProductName, pageReqVO.getProductName()) .likeIfPresent(PurchaseRecordDO::getProductName, pageReqVO.getProductName())
.eqIfPresent(PurchaseRecordDO::getPurchaseDuration, pageReqVO.getPurchaseDuration()) .eqIfPresent(PurchaseRecordDO::getPurchaseDuration, pageReqVO.getPurchaseDuration())
.betweenIfPresent(PurchaseRecordDO::getCreateTime, pageReqVO.getCreateTime()) .betweenIfPresent(PurchaseRecordDO::getCreateTime, pageReqVO.getCreateTime())
.likeIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getCreator())); .likeIfPresent(PurchaseRecordDO::getCreator, pageReqVO.getCreator())
.orderByDesc(PurchaseRecordDO::getCreateTime));
} }