From 078ef3e4291665a60dda609a631c5fca418947b9 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 15:48:28 +0800
Subject: [PATCH] 删除旧文件上传
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 7cc660c..c6b1406 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -14,6 +17,12 @@
@Data
public class PurchaseLedgerDto {
+ /**
+ * 瀹℃壒浜篿d鍒楄〃
+ */
+ @Schema(description = "瀹℃壒浜篿d鍒楄〃")
+ private String approveUserIds;
+
private String entryDateStart;
@@ -39,6 +48,11 @@
*/
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+ /**
+ * 鏄惁鐧藉悕鍗�
+ */
+ @Excel(name = "鏄惁鐧藉悕鍗�")
+ private Integer isWhite;
/**
* 褰曞叆浜哄鍚峣d
@@ -75,6 +89,14 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate;
+
+ /**
+ * 绛捐鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "绛捐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date executionDate;
/**
* 澶囨敞
@@ -155,21 +177,29 @@
@TableField(exist = false)
- @ApiModelProperty("鏉ョエ閲戦")
+ @Schema(description = "鏉ョエ閲戦")
@Excel(name = "宸叉潵绁ㄩ噾棰�(鍏�)")
private BigDecimal receiptPaymentAmount = BigDecimal.ZERO;
- @ApiModelProperty("鏈潵绁ㄩ噾棰�")
+ @Schema(description = "鏈潵绁ㄩ噾棰�")
@TableField(exist = false)
@Excel(name = "鏈潵绁ㄩ噾棰�(鍏�)")
private BigDecimal unReceiptPaymentAmount =BigDecimal.ZERO;
- @ApiModelProperty("鏂囦欢绫诲瀷 鍙� 4")
+ @Schema(description = "鏂囦欢绫诲瀷 鍙� 4")
@TableField(exist = false)
private Integer type;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
+ @Schema(description = "瀹℃壒鐘舵��")
+ private Integer approvalStatus;
+ @Schema(description = "妯℃澘鍚嶇О")
+ private String templateName;
+ @Schema(description = "瀹℃壒浜篿d")
+ private Integer approverId;
+ private List<StorageBlobVO> storageBlobVOS;
+ private List<StorageBlobDTO> storageBlobDTOS;
}
--
Gitblit v1.9.3