Merge remote-tracking branch 'origin/main'

new
JiilingLee 1 year ago
commit 4a1f975c9c

@ -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 '';

@ -155,6 +155,7 @@ public class BankSlipController {
System.out.println(ocrResult); System.out.println(ocrResult);
BankReceiptDO wordsResult = JSONObject.toJavaObject( ocrResult, BankReceiptDO.class); BankReceiptDO wordsResult = JSONObject.toJavaObject( ocrResult, BankReceiptDO.class);
BankSlipDO bankSlipDO = bankSlipService.jsonToJavaObject(wordsResult, multipartFile); BankSlipDO bankSlipDO = bankSlipService.jsonToJavaObject(wordsResult, multipartFile);
bankSlipDO.setFileName(multipartFile.getOriginalFilename());
return success(bankSlipDO); return success(bankSlipDO);
} }
} }

@ -148,5 +148,7 @@ public class BankSlipBaseVO {
@Schema(description = "银行回单地址") @Schema(description = "银行回单地址")
private String fileUrl; private String fileUrl;
@Schema(description = "银行回单文件名称")
private String FileName;
} }

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo; package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -139,4 +140,6 @@ public class BankSlipExcelVO {
@ExcelProperty("密码") @ExcelProperty("密码")
private String password; private String password;
@ExcelProperty("银行回单文件名称")
private String FileName;
} }

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo; 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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -137,4 +138,7 @@ public class BankSlipExportReqVO {
@Schema(description = "密码") @Schema(description = "密码")
private String password; private String password;
@Schema(description = "银行回单文件名称")
private String FileName;
} }

@ -142,4 +142,6 @@ public class BankSlipPageReqVO extends PageParam {
@Schema(description = "密码") @Schema(description = "密码")
private String inputPassword; private String inputPassword;
@Schema(description = "银行回单文件名称")
private String FileName;
} }

@ -64,4 +64,9 @@ public class FlowBaseVO {
@Schema(description = "密码") @Schema(description = "密码")
String inputPassword; String inputPassword;
@Schema(description = "文件名称")
private String fileName;
} }

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.accounting.controller.admin.flow.vo; package cn.iocoder.yudao.module.accounting.controller.admin.flow.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -70,4 +71,7 @@ public class FlowExcelVO {
@ExcelProperty("归档状态") @ExcelProperty("归档状态")
private String archiveState; private String archiveState;
@Schema(description = "文件名称")
private String fileName;
} }

@ -67,4 +67,6 @@ public class FlowExportReqVO {
@Schema(description = "归档状态") @Schema(description = "归档状态")
private String archiveState; private String archiveState;
@Schema(description = "文件名称")
private String fileName;
} }

@ -75,4 +75,7 @@ public class FlowPageReqVO extends PageParam {
@Schema(description = "密码") @Schema(description = "密码")
String inputPassword; String inputPassword;
@Schema(description = "文件名称")
private String fileName;
} }

@ -213,7 +213,7 @@ public class InvoicesController {
} else { } else {
url = getUrl(multipartFile, "other", "other"); url = getUrl(multipartFile, "other", "other");
} }
invoicesDO.setFileUrl(url); invoicesDO.setFileUrl(url).setFileName(multipartFile.getOriginalFilename());
return success(invoicesDO); return success(invoicesDO);
} }

@ -212,4 +212,7 @@ public class InvoicesBaseVO {
@Schema(description = "发票地址") @Schema(description = "发票地址")
private String fileUrl; private String fileUrl;
@Schema(description = "发票文件名称")
private String fileName;
} }

@ -211,6 +211,17 @@ public class InvoicesExcelVO {
@ExcelProperty(value = "归档状态", index = 63) @ExcelProperty(value = "归档状态", index = 63)
private String archiveState; private String archiveState;
@ExcelProperty("发票文件名称")
private String fileName;
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public Long getId() { public Long getId() {
return id; return id;
} }
@ -858,6 +869,7 @@ public class InvoicesExcelVO {
", attr2='" + attr2 + '\'' + ", attr2='" + attr2 + '\'' +
", attr3=" + attr3 + ", attr3=" + attr3 +
", attr4=" + attr4 + ", attr4=" + attr4 +
", fileName=" + fileName +
", archiveState='" + archiveState + '\'' + ", archiveState='" + archiveState + '\'' +
'}'; '}';
} }

@ -207,4 +207,7 @@ public class InvoicesExportReqVO {
@Schema(description = "发票地址") @Schema(description = "发票地址")
private String fileUrl; private String fileUrl;
@Schema(description = "发票文件名称")
private String fileName;
} }

@ -211,4 +211,7 @@ public class InvoicesPageReqVO extends PageParam {
@Schema(description = "密码") @Schema(description = "密码")
String inputPassword; String inputPassword;
@Schema(description = "发票文件名称")
private String fileName;
} }

@ -211,5 +211,10 @@ public class BankSlipDO extends BaseDO {
*/ */
private String fileUrl; private String fileUrl;
/**
*
*/
private String fileName;
} }

@ -102,4 +102,9 @@ public class FlowDO extends BaseDO {
*/ */
String password; String password;
/**
*
*/
String fileName;
} }

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.accounting.dal.dataobject.invoices; package cn.iocoder.yudao.module.accounting.dal.dataobject.invoices;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -283,4 +284,9 @@ public class InvoicesDO extends BaseDO {
*/ */
private String fileUrl; private String fileUrl;
/**
*
*/
private String fileName;
} }

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.accounting.dal.dataobject.voucherdetails; package cn.iocoder.yudao.module.accounting.dal.dataobject.voucherdetails;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;

Loading…
Cancel
Save