From 743b74dfa59b05cb4bafe8678d8a6223a283ad03 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 29 六月 2026 02:18:42 +0800
Subject: [PATCH] fix: 质检合格率有误
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 24d8bc1..204a18a 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -2058,11 +2058,10 @@
@Override
public NonComplianceWarningDto nonComplianceWarning() {
- String[] range = lastSevenDaysDateRange();
+ String[] range = lastMonthDateRange();
String startStr = range[0];
String endStr = range[1];
- // 鏌ヨ杩戜竷澶╁凡澶勭悊涓嶅悎鏍兼暟鎹�
List<QualityUnqualified> list = qualityUnqualifiedMapper.selectList(
new LambdaQueryWrapper<QualityUnqualified>()
.eq(QualityUnqualified::getInspectState, 1)
@@ -2126,7 +2125,6 @@
// 缁勮鏄庣粏
NonComplianceWarningDto.Item child = new NonComplianceWarningDto.Item();
- // child.setProductTitle(item.getProductName());
child.setParentProductTitle(parent.getProductName());
child.setProductTitle(item.getProductName());
child.setDescription(item.getDefectivePhenomena());
@@ -2146,6 +2144,14 @@
return dto;
}
+ private String[] lastMonthDateRange() {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime startTime = now.minusMonths(1);
+
+ return new String[]{startTime.format(formatter), now.format(formatter)};
+ }
+
private BigDecimal calcRate(BigDecimal part, BigDecimal total) {
if (total == null || total.compareTo(BigDecimal.ZERO) == 0) {
return BigDecimal.ZERO.setScale(2);
--
Gitblit v1.9.3