From 704404a23faa4e9d952fc42f5c4c91321569903c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 02 二月 2026 17:50:47 +0800
Subject: [PATCH] fix: 返回结果移除List集合
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 7e96c10..8de8a83 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -1894,21 +1894,21 @@
@Override
- public List<QualityQualifiedAnalysisDto> rawMaterialDetection(Integer type) {
+ public QualityQualifiedAnalysisDto rawMaterialDetection(Integer type) {
return commonDetection(type, 0);
}
@Override
- public List<QualityQualifiedAnalysisDto> processDetection(Integer type) {
+ public QualityQualifiedAnalysisDto processDetection(Integer type) {
return commonDetection(type, 1);
}
@Override
- public List<QualityQualifiedAnalysisDto> factoryDetection(Integer type) {
+ public QualityQualifiedAnalysisDto factoryDetection(Integer type) {
return commonDetection(type, 2);
}
- private List<QualityQualifiedAnalysisDto> commonDetection(Integer type, Integer inspectType) {
+ private QualityQualifiedAnalysisDto commonDetection(Integer type, Integer inspectType) {
LocalDate[] range = calcDateRange(type);
LocalDate startDate = range[0];
@@ -1958,7 +1958,7 @@
return new LocalDate[]{startDate, endDate};
}
- private List<QualityQualifiedAnalysisDto> buildQualifiedAnalysis(List<QualityInspect> list) {
+ private QualityQualifiedAnalysisDto buildQualifiedAnalysis(List<QualityInspect> list) {
List<QualityQualifiedAnalysisDto> result = new ArrayList<>();
QualityQualifiedAnalysisDto dto = new QualityQualifiedAnalysisDto();
@@ -1967,8 +1967,7 @@
dto.setUnqualifiedCount(0);
dto.setQualifiedRate(BigDecimal.ZERO.setScale(2));
dto.setUnqualifiedRate(BigDecimal.ZERO.setScale(2));
- result.add(dto);
- return result;
+ return dto;
}
BigDecimal qualifiedCount = BigDecimal.ZERO;
@@ -1990,8 +1989,7 @@
if (totalCount.compareTo(BigDecimal.ZERO) == 0) {
dto.setQualifiedRate(BigDecimal.ZERO.setScale(2));
dto.setUnqualifiedRate(BigDecimal.ZERO.setScale(2));
- result.add(dto);
- return result;
+ return dto;
}
BigDecimal hundred = BigDecimal.valueOf(100);
@@ -2004,8 +2002,7 @@
.multiply(hundred)
.setScale(2, RoundingMode.HALF_UP));
- result.add(dto);
- return result;
+ return dto;
}
@Override
@@ -2173,7 +2170,8 @@
// 缁勮鏄庣粏
NonComplianceWarningDto.Item child = new NonComplianceWarningDto.Item();
// child.setProductTitle(item.getProductName());
- child.setProductTitle(parent.getProductName());
+ child.setParentProductTitle(parent.getProductName());
+ child.setProductTitle(item.getProductName());
child.setDescription(item.getDefectivePhenomena());
child.setDate(formatDate(item.getCheckTime()));
children.add(child);
--
Gitblit v1.9.3