调整结算模块

2026-09-08 10:58:21 +08:00
parent 4e9bb19b23
commit a3eeb24f4f
7 changed files with 249 additions and 41 deletions
@@ -0,0 +1,40 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ */
+package org.springblade.transport.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 凭证压缩包解压文件明细。
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("blade_voucher_file")
+@Schema(description = "凭证文件明细")
+public class VoucherFile extends TenantEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	private Long voucherId;
+	private String voucherBatchNo;
+	private Long waybillId;
+	private String waybillNo;
+	private String plateNo;
+	private String folderName;
+	private String entryName;
+	private String fileName;
+	private String objectKey;
+	private Long fileSize;
+	private String contentType;
+	private String fileType;
+	private Integer matched;
+}
@@ -0,0 +1,32 @@
+package org.springblade.transport.pojo.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 凭证解压文件详情。
+ */
+@Data
+public class VoucherFileVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	private Long voucherId;
+	private String voucherBatchNo;
+	private Long waybillId;
+	private String waybillNo;
+	private String plateNo;
+	private String folderName;
+	private String entryName;
+	private String fileName;
+	private String objectKey;
+	private Long fileSize;
+	private String contentType;
+	private String fileType;
+	private Integer matched;
+	private String url;
+}
@@ -7,6 +7,7 @@ import org.springblade.transport.pojo.entity.VoucherManage;

 import java.io.Serial;
 import java.time.LocalDateTime;
+import java.util.List;

@Data
@EqualsAndHashCode(callSuper = true)
@@ -16,4 +17,5 @@ public class VoucherManageVO extends VoucherManage {
 	@TableField(exist = false) private String updateUserName;
 	@TableField(exist = false) private LocalDateTime createTimeStart;
 	@TableField(exist = false) private LocalDateTime createTimeEnd;
+	@TableField(exist = false) private List<VoucherFileVO> voucherFiles;
 }