diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceDetailsRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceDetailsRespVO.java index f3e43d358..15185926a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceDetailsRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/invoice/vo/InvoiceDetailsRespVO.java @@ -34,8 +34,8 @@ public class InvoiceDetailsRespVO { @Schema(description = "申请时间") private LocalDateTime applyTime; - @Schema(description = "发票附件路径") - private String invoiceAttachmentPath; + @Schema(description = "发票附件文件id") + private Long invoiceAttachmentId; @Schema(description = "发票附件名称") private String invoiceAttachmentName; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/invoice/InvoiceRecordsDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/invoice/InvoiceRecordsDO.java index ef19af537..d9b4aeeec 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/invoice/InvoiceRecordsDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/invoice/InvoiceRecordsDO.java @@ -79,7 +79,7 @@ public class InvoiceRecordsDO extends BaseDO { /** * 发票附件保存路径 */ - private String invoiceAttachmentPath; + private Long invoiceAttachmentId; /** * 开票附件名称 diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java index 8c606f0ea..f633e494f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java @@ -320,7 +320,7 @@ public class InvoiceServiceImpl implements InvoiceService { .applicant(invoiceRecordsDO.getCreator()) .orgName(invoiceRecordsDO.getOrganName()) .applyTime(invoiceRecordsDO.getCreateTime()) - .invoiceAttachmentPath(invoiceRecordsDO.getInvoiceAttachmentPath()) + .invoiceAttachmentId(invoiceRecordsDO.getInvoiceAttachmentId()) .invoiceAttachmentName(invoiceRecordsDO.getInvoiceAttachmentName()) .remark(invoiceRecordsDO.getRemark()) .build(); @@ -360,8 +360,8 @@ public class InvoiceServiceImpl implements InvoiceService { } String invoiceFileName = invoiceTitleInfoDO.getInvoiceTitle() + "-" + LocalDateTimeUtil.format(now, PURE_DATETIME_PATTERN) + "-" + invoiceRecordsDO.getInvoiceAmount().stripTrailingZeros().toPlainString() + getFileExtension(file.getOriginalFilename()); - String filePath = fileApi.createFile(IoUtil.readBytes(file.getInputStream()), invoiceFileName); - invoiceRecordsDO.setInvoiceAttachmentPath(filePath); + Long fileId = fileApi.createFileAndReturnId(IoUtil.readBytes(file.getInputStream()), invoiceFileName); + invoiceRecordsDO.setInvoiceAttachmentId(fileId); invoiceRecordsDO.setInvoiceAttachmentName(invoiceFileName); invoiceRecordsDO.setInvoiceNo(reqVO.getInvoiceNo()); invoiceRecordsDO.setInvoiceTime(now);