From 3f1d871318231ebabb3be06c4ca2ca770b5b0220 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 09:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
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>()
--
Gitblit v1.9.3