From ced8477cd8620650d2fc942f74a0d4350ecb7b7e Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 16 三月 2026 17:38:22 +0800
Subject: [PATCH] 质量管理：优化下载原料时doc显示
---
src/main/java/com/ruoyi/quality/pojo/RawMaterial.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
index bb398b3..f84e322 100644
--- a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
+++ b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
@@ -6,6 +6,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +14,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -36,17 +38,13 @@
@ApiModelProperty("浜у搧鍨嬪彿id")
private Long productModelId;
- @ApiModelProperty("鎵规鍙�")
- @Excel(name = "鎵规鍙�")
- private String batchNo;
-
- @ApiModelProperty("鏁伴噺")
- @Excel(name = "鏁伴噺")
- private BigDecimal quantity;
-
@ApiModelProperty("妫�楠岀被鍨� 0鍏ュ巶妫� 1杞﹂棿妫� 2鍑哄巶妫�")
@Excel(name = "妫�楠岀被鍨�", readConverterExp = "0=鍏ュ巶妫�,1=杞﹂棿妫�,2=鍑哄巶妫�")
private Integer checkType;
+
+ @ApiModelProperty("鎵规鍙�")
+ @Excel(name = "鎵规鍙�")
+ private String batchNo;
@ApiModelProperty("妫�楠岀粨鏋� 0鍚堟牸 1涓嶅悎鏍�")
@Excel(name = "妫�楠岀粨鏋�", readConverterExp = "0=鍚堟牸,1=涓嶅悎鏍�")
@@ -62,8 +60,9 @@
@ApiModelProperty("妫�楠屾棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
- private LocalDate checkTime;
+ private Date checkTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
--
Gitblit v1.9.3