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/resources/static/report-template.docx | 0
src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java | 3 +++
src/main/java/com/ruoyi/quality/pojo/RawMaterial.java | 2 ++
src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java | 3 +++
4 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
index 7357a19..e56b4f0 100644
--- a/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
@@ -55,4 +55,7 @@
@ApiModelProperty("鍗曚綅")
private String unit;
+
+ @ApiModelProperty("妫�楠屾棩鏈�")
+ private String checkTimeText;
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
index df0c2d2..f84e322 100644
--- a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
+++ b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
@@ -14,6 +14,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -59,6 +60,7 @@
@ApiModelProperty("妫�楠屾棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
diff --git a/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
index d3ce5cd..fb2eb39 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
@@ -44,6 +44,8 @@
import java.util.*;
import java.util.stream.Collectors;
+import static com.ruoyi.home.service.impl.HomeServiceImpl.formatDate;
+
/**
* <p>
@@ -311,6 +313,7 @@
inspect.setProductName(product.getProductName());
inspect.setCheckTypeText(RawMaterialCheckType.fromValue(rawMaterial.getCheckType()) == null ? "" : RawMaterialCheckType.fromValue(rawMaterial.getCheckType()).getValue());
inspect.setCheckResultText(RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()) == null ? "" : RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()).getValue());
+ inspect.setCheckTimeText(formatDate(rawMaterial.getCheckTime()));
List<RawMaterialQualityInspectItem> paramList = rawMaterialQualityInspectItemService.list(
new LambdaQueryWrapper<RawMaterialQualityInspectItem>()
diff --git a/src/main/resources/static/report-template.docx b/src/main/resources/static/report-template.docx
index 9a47def..9ef81ef 100644
--- a/src/main/resources/static/report-template.docx
+++ b/src/main/resources/static/report-template.docx
Binary files differ
--
Gitblit v1.9.3