From 7305a453ee1aa170218e4974c1a9bdfd47563044 Mon Sep 17 00:00:00 2001 From: "LAPTOP-0SF788NU\\admin" <3306174053@qq.com> Date: Mon, 6 Nov 2023 12:26:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=A1=E5=87=AD=E8=AF=81=E4=B8=8B?= =?UTF-8?q?=E8=AE=B0=E8=B4=A6=E5=87=AD=E8=AF=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/20231106JS.sql | 11 +++++++++++ .../admin/bankslip/BankSlipController.java | 1 + .../controller/admin/bankslip/vo/BankSlipBaseVO.java | 2 ++ .../admin/bankslip/vo/BankSlipExcelVO.java | 3 +++ .../admin/bankslip/vo/BankSlipExportReqVO.java | 4 ++++ .../admin/bankslip/vo/BankSlipPageReqVO.java | 2 ++ .../controller/admin/flow/vo/FlowBaseVO.java | 5 +++++ .../controller/admin/flow/vo/FlowExcelVO.java | 4 ++++ .../controller/admin/flow/vo/FlowExportReqVO.java | 2 ++ .../controller/admin/flow/vo/FlowPageReqVO.java | 3 +++ .../admin/invoices/InvoicesController.java | 2 +- .../controller/admin/invoices/vo/InvoicesBaseVO.java | 3 +++ .../admin/invoices/vo/InvoicesExcelVO.java | 12 ++++++++++++ .../admin/invoices/vo/InvoicesExportReqVO.java | 3 +++ .../admin/invoices/vo/InvoicesPageReqVO.java | 3 +++ .../dal/dataobject/bankslip/BankSlipDO.java | 5 +++++ .../dal/dataobject/invoices/InvoicesDO.java | 6 ++++++ .../dataobject/voucherdetails/VoucherDetailsDO.java | 6 ++++++ 18 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 sql/20231106JS.sql diff --git a/sql/20231106JS.sql b/sql/20231106JS.sql new file mode 100644 index 00000000..59b328d7 --- /dev/null +++ b/sql/20231106JS.sql @@ -0,0 +1,11 @@ + +-- 银行回单新增 文件名称 字段 +ALTER TABLE archives_bank_slip ADD COLUMN `file_name` varchar(64) NULL DEFAULT NULL COMMENT '银行回单文件名称'; + + +-- 发票新增 文件名称 字段 +ALTER TABLE accounting_invoices ADD COLUMN `file_name` varchar(64) NULL DEFAULT NULL COMMENT '发票文件名称'; + + +-- 审批流程新增 文件名称 字段 +ALTER TABLE archives_flow ADD COLUMN `file_name` varchar(64) NULL DEFAULT NULL COMMENT '审批流程文件名称'; diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/BankSlipController.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/BankSlipController.java index 36b77c2a..1981a38a 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/BankSlipController.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/BankSlipController.java @@ -155,6 +155,7 @@ public class BankSlipController { System.out.println(ocrResult); BankReceiptDO wordsResult = JSONObject.toJavaObject( ocrResult, BankReceiptDO.class); BankSlipDO bankSlipDO = bankSlipService.jsonToJavaObject(wordsResult, multipartFile); + bankSlipDO.setFileName(multipartFile.getOriginalFilename()); return success(bankSlipDO); } } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipBaseVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipBaseVO.java index da2cec78..7b61e13a 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipBaseVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipBaseVO.java @@ -148,5 +148,7 @@ public class BankSlipBaseVO { @Schema(description = "银行回单地址") private String fileUrl; + @Schema(description = "银行回单文件名称") + private String FileName; } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipExcelVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipExcelVO.java index e3b0e81e..390f3ebe 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipExcelVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipExcelVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo; import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; @@ -139,4 +140,6 @@ public class BankSlipExcelVO { @ExcelProperty("密码") private String password; + @ExcelProperty("银行回单文件名称") + private String FileName; } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipExportReqVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipExportReqVO.java index 96e01429..74ee6c20 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipExportReqVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipExportReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -137,4 +138,7 @@ public class BankSlipExportReqVO { @Schema(description = "密码") private String password; + @Schema(description = "银行回单文件名称") + private String FileName; + } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipPageReqVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipPageReqVO.java index 45e0e28e..64dbfd7d 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipPageReqVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipPageReqVO.java @@ -142,4 +142,6 @@ public class BankSlipPageReqVO extends PageParam { @Schema(description = "密码") private String inputPassword; + @Schema(description = "银行回单文件名称") + private String FileName; } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowBaseVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowBaseVO.java index 897a07c2..5c71ea4c 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowBaseVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowBaseVO.java @@ -64,4 +64,9 @@ public class FlowBaseVO { @Schema(description = "密码") String inputPassword; + + @Schema(description = "文件名称") + private String fileName; + + } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExcelVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExcelVO.java index 4c947482..63ba1258 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExcelVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExcelVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.accounting.controller.admin.flow.vo; import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; @@ -70,4 +71,7 @@ public class FlowExcelVO { @ExcelProperty("归档状态") private String archiveState; + @Schema(description = "文件名称") + private String fileName; + } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExportReqVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExportReqVO.java index e85c2650..c0a0ebd4 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExportReqVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExportReqVO.java @@ -67,4 +67,6 @@ public class FlowExportReqVO { @Schema(description = "归档状态") private String archiveState; + @Schema(description = "文件名称") + private String fileName; } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowPageReqVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowPageReqVO.java index c58426fe..2d325b1f 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowPageReqVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowPageReqVO.java @@ -75,4 +75,7 @@ public class FlowPageReqVO extends PageParam { @Schema(description = "密码") String inputPassword; + @Schema(description = "文件名称") + private String fileName; + } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/InvoicesController.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/InvoicesController.java index 9b0b2fa7..a69be58e 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/InvoicesController.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/InvoicesController.java @@ -213,7 +213,7 @@ public class InvoicesController { } else { url = getUrl(multipartFile, "other", "other"); } - invoicesDO.setFileUrl(url); + invoicesDO.setFileUrl(url).setFileName(multipartFile.getOriginalFilename()); return success(invoicesDO); } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesBaseVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesBaseVO.java index 5748a8dc..c723c2ba 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesBaseVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesBaseVO.java @@ -212,4 +212,7 @@ public class InvoicesBaseVO { @Schema(description = "发票地址") private String fileUrl; + @Schema(description = "发票文件名称") + private String fileName; + } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesExcelVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesExcelVO.java index 11a74b17..f4925e21 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesExcelVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesExcelVO.java @@ -211,6 +211,17 @@ public class InvoicesExcelVO { @ExcelProperty(value = "归档状态", index = 63) private String archiveState; + @ExcelProperty("发票文件名称") + private String fileName; + + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } public Long getId() { return id; } @@ -858,6 +869,7 @@ public class InvoicesExcelVO { ", attr2='" + attr2 + '\'' + ", attr3=" + attr3 + ", attr4=" + attr4 + + ", fileName=" + fileName + ", archiveState='" + archiveState + '\'' + '}'; } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesExportReqVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesExportReqVO.java index 5aad2a22..886072f2 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesExportReqVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesExportReqVO.java @@ -207,4 +207,7 @@ public class InvoicesExportReqVO { @Schema(description = "发票地址") private String fileUrl; + @Schema(description = "发票文件名称") + private String fileName; + } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesPageReqVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesPageReqVO.java index b045df54..68f1f551 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesPageReqVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/vo/InvoicesPageReqVO.java @@ -211,4 +211,7 @@ public class InvoicesPageReqVO extends PageParam { @Schema(description = "密码") String inputPassword; + + @Schema(description = "发票文件名称") + private String fileName; } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/bankslip/BankSlipDO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/bankslip/BankSlipDO.java index 3581d43d..6ed0ec44 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/bankslip/BankSlipDO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/bankslip/BankSlipDO.java @@ -211,5 +211,10 @@ public class BankSlipDO extends BaseDO { */ private String fileUrl; + /** + * 回单文件地址 + */ + private String fileName; + } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/invoices/InvoicesDO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/invoices/InvoicesDO.java index efe1af89..b95a833b 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/invoices/InvoicesDO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/invoices/InvoicesDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.accounting.dal.dataobject.invoices; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -283,4 +284,9 @@ public class InvoicesDO extends BaseDO { */ private String fileUrl; + /** + * 发票图片名称 + */ + private String fileName; + } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/voucherdetails/VoucherDetailsDO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/voucherdetails/VoucherDetailsDO.java index 95090626..38f1f422 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/voucherdetails/VoucherDetailsDO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/voucherdetails/VoucherDetailsDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.accounting.dal.dataobject.voucherdetails; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -106,4 +107,9 @@ public class VoucherDetailsDO extends BaseDO { */ private Integer attr4; + /** + * 审批流程图片名称 + */ + private String fileName; + }