From 6d5ce70c3e2b536c8e4b74269be70029a57cb1cc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 11 五月 2026 15:36:32 +0800
Subject: [PATCH] feat(approve): 使用通用工具类优化审批流程ID生成逻辑
---
src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
index 310ca78..cbbee11 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
@@ -24,12 +24,20 @@
@ApiModel
public class ProcurementBusinessSummaryDto {
+ @Excel(name = "浜у搧澶х被")
private String productCategory;
/**
* 瑙勬牸鍨嬪彿
*/
+ @Excel(name = "瑙勬牸鍨嬪彿")
private String specificationModel;
+
+ /**
+ * 鏂欏彿
+ */
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -44,33 +52,40 @@
/**
* 閲囪喘鏁伴噺
*/
+ @Excel(name = "閲囪喘鏁伴噺")
private BigDecimal purchaseNum;
/**
* 閲囪喘閲戦
*/
+ @Excel(name = "閲囪喘閲戦")
private BigDecimal purchaseAmount;
/**
* 閲囪喘娆℃暟
*/
+ @Excel(name = "閲囪喘娆℃暟")
private Integer purchaseTimes;
/**
* 骞冲潎鍗曚环
*/
+ @Excel(name = "骞冲潎鍗曚环")
private BigDecimal averagePrice;
/**
* 渚涘簲鍟嗗悕绉�
*/
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
/**
* 褰曞叆鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate;
}
--
Gitblit v1.9.3