From 7828b982da116070fe11526733609ecce23631b6 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 15 五月 2026 19:55:28 +0800
Subject: [PATCH] feat: 设备维修新增报修人、验收人、维修人
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 70 insertions(+), 42 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 1e94a30..e030833 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -308,6 +308,47 @@
return analysisCustomerContractAmountsDto;
}
+ private static BigDecimal nz(BigDecimal v) {
+ return v == null ? BigDecimal.ZERO : v;
+ }
+
+ /**
+ * 澶у睆/鎶ヨ〃缁熻鐢ㄥ悎鏍兼暟閲忥細浠� qualified_quantity
+ */
+ private BigDecimal inspectQualifiedQtyForStat(QualityInspect item) {
+ if (item.getQualifiedQuantity() != null) {
+ return item.getQualifiedQuantity();
+ }
+ BigDecimal qty = nz(item.getQuantity());
+ if ("鍚堟牸".equals(item.getCheckResult())) {
+ return qty;
+ }
+ return BigDecimal.ZERO;
+ }
+
+ /**
+ * 澶у睆/鎶ヨ〃缁熻鐢ㄤ笉鍚堟牸鏁伴噺锛氫互 unqualified_quantity
+ */
+ private BigDecimal inspectUnqualifiedQtyForStat(QualityInspect item) {
+ if (item.getUnqualifiedQuantity() != null) {
+ return item.getUnqualifiedQuantity();
+ }
+ BigDecimal qty = nz(item.getQuantity());
+ String cr = item.getCheckResult();
+ if ("涓嶅悎鏍�".equals(cr) || "閮ㄥ垎鍚堟牸".equals(cr)) {
+ return qty;
+ }
+ return BigDecimal.ZERO;
+ }
+
+ private boolean inspectHasUnqualifiedVolume(QualityInspect item) {
+ return inspectUnqualifiedQtyForStat(item).compareTo(BigDecimal.ZERO) > 0;
+ }
+
+ private static int toStatInt(BigDecimal v) {
+ return nz(v).setScale(0, RoundingMode.HALF_UP).intValue();
+ }
+
@Override
public QualityStatisticsDto qualityStatistics() {
// 鑾峰彇杩戝洓涓湀鏁版嵁锛堝線鍓嶆帹涓変釜鏈堬紝鍏�4涓畬鏁存湀浠斤級
@@ -355,29 +396,27 @@
QualityStatisticsItem item = new QualityStatisticsItem();
item.setDate(monthStart.format(monthFormatter)); // 鏃ユ湡鏄剧ず涓衡�滃勾鏈堚�濓紙濡� 2025-10锛�
- // 1. 渚涘簲鍟嗘楠岋紙绫诲瀷0锛�- 鍚堟牸鏁伴噺
- BigDecimal supplierQualified = monthInspects.stream()
+ // 1锝�3锛氭湰鏈堛�屼笉鍚堟牸鏁伴噺銆嶏紙浠呭凡鎻愪氦妫�楠岋級锛屾寜妫�楠岀被鍒媶鍒嗏�斺�旂敤浜庡浘琛ㄥ浘渚嬨�屆椕椾笉鍚堟牸鏁般��
+ BigDecimal supplierUnq = monthInspects.stream()
.filter(inspect -> inspect.getInspectType().equals(0)
- && "鍚堟牸".equals(inspect.getCheckResult()))
- .map(QualityInspect::getQuantity)
+ && Objects.equals(inspect.getInspectState(), 1))
+ .map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- item.setSupplierNum(supplierQualified);
+ item.setSupplierNum(supplierUnq);
- // 2. 宸ュ簭妫�楠岋紙绫诲瀷1锛�- 鍚堟牸鏁伴噺
- BigDecimal processQualified = monthInspects.stream()
+ BigDecimal processUnq = monthInspects.stream()
.filter(inspect -> inspect.getInspectType().equals(1)
- && "鍚堟牸".equals(inspect.getCheckResult()))
- .map(QualityInspect::getQuantity)
+ && Objects.equals(inspect.getInspectState(), 1))
+ .map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- item.setProcessNum(processQualified);
+ item.setProcessNum(processUnq);
- // 3. 宸ュ巶妫�楠岋紙绫诲瀷2锛�- 鍚堟牸鏁伴噺
- BigDecimal factoryQualified = monthInspects.stream()
+ BigDecimal factoryUnq = monthInspects.stream()
.filter(inspect -> inspect.getInspectType().equals(2)
- && "鍚堟牸".equals(inspect.getCheckResult()))
- .map(QualityInspect::getQuantity)
+ && Objects.equals(inspect.getInspectState(), 1))
+ .map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- item.setFactoryNum(factoryQualified);
+ item.setFactoryNum(factoryUnq);
qualityStatisticsItems.add(item);
}
@@ -1902,17 +1941,14 @@
BigDecimal unqualifiedCount = BigDecimal.ZERO;
for (QualityInspect item : list) {
- if ("鍚堟牸".equals(item.getCheckResult())) {
- qualifiedCount = qualifiedCount.add(item.getQuantity());
- } else {
- unqualifiedCount = unqualifiedCount.add(item.getQuantity());
- }
+ qualifiedCount = qualifiedCount.add(inspectQualifiedQtyForStat(item));
+ unqualifiedCount = unqualifiedCount.add(inspectUnqualifiedQtyForStat(item));
}
BigDecimal totalCount = qualifiedCount.add(unqualifiedCount);
- dto.setQualifiedCount(qualifiedCount.intValue());
- dto.setUnqualifiedCount(unqualifiedCount.intValue());
+ dto.setQualifiedCount(toStatInt(qualifiedCount));
+ dto.setUnqualifiedCount(toStatInt(unqualifiedCount));
if (totalCount.compareTo(BigDecimal.ZERO) == 0) {
dto.setQualifiedRate(BigDecimal.ZERO.setScale(2));
@@ -2175,13 +2211,8 @@
continue;
}
- BigDecimal quantity = item.getQuantity();
-
- if ("鍚堟牸".equals(item.getCheckResult())) {
- dto.setQualifiedCount(dto.getQualifiedCount().add(quantity));
- } else {
- dto.setUnqualifiedCount(dto.getUnqualifiedCount().add(quantity));
- }
+ dto.setQualifiedCount(dto.getQualifiedCount().add(inspectQualifiedQtyForStat(item)));
+ dto.setUnqualifiedCount(dto.getUnqualifiedCount().add(inspectUnqualifiedQtyForStat(item)));
}
// 璁＄畻鍚堟牸鐜�
@@ -2222,14 +2253,11 @@
BigDecimal unqualifiedCount = BigDecimal.ZERO;
for (QualityInspect item : items) {
- BigDecimal qty = item.getQuantity();
+ BigDecimal qty = nz(item.getQuantity());
totalCount = totalCount.add(qty);
- if ("鍚堟牸".equals(item.getCheckResult())) {
- qualifiedCount = qualifiedCount.add(qty);
- } else {
- unqualifiedCount = unqualifiedCount.add(qty);
- }
+ qualifiedCount = qualifiedCount.add(inspectQualifiedQtyForStat(item));
+ unqualifiedCount = unqualifiedCount.add(inspectUnqualifiedQtyForStat(item));
}
if (totalCount.compareTo(BigDecimal.ZERO) == 0) {
@@ -2358,10 +2386,10 @@
dto.setProcessNum(sumQuantity(qualityInspectList, 1)); // 杩囩▼
dto.setFactoryNum(sumQuantity(qualityInspectList, 2)); // 鍑哄巶
- // 鍋囪 qualityInspectList 鏄竴涓� List<QualityInspect> 绫诲瀷鐨勯泦鍚�
- Map<String, List<QualityInspect>> groupedByCheckResult = qualityInspectList.stream()
- .collect(Collectors.groupingBy(QualityInspect::getCheckResult));
- List<QualityInspect> qualityInspects = groupedByCheckResult.get("涓嶅悎鏍�");
+ // 瀛樺湪涓嶅悎鏍兼暟閲忕殑妫�楠屽崟锛堝惈鎸夋暟閲忔媶鍒嗙殑鏂版暟鎹紱鏃ф暟鎹粛鍙敤妫�娴嬬粨鏋滃厹搴曪級
+ List<QualityInspect> qualityInspects = qualityInspectList.stream()
+ .filter(this::inspectHasUnqualifiedVolume)
+ .collect(Collectors.toList());
if (ObjectUtils.isNull(qualityInspects) || qualityInspects.size() == 0) {
return dto;
}
@@ -2416,11 +2444,11 @@
QualityStatisticsItem item = new QualityStatisticsItem();
item.setDate(dateLabel);
- item.setSupplierNum(list.stream().filter(i -> i.getInspectType() == 0).map(QualityInspect::getQuantity)
+ item.setSupplierNum(list.stream().filter(i -> i.getInspectType() == 0).map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add));
- item.setProcessNum(list.stream().filter(i -> i.getInspectType() == 1).map(QualityInspect::getQuantity)
+ item.setProcessNum(list.stream().filter(i -> i.getInspectType() == 1).map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add));
- item.setFactoryNum(list.stream().filter(i -> i.getInspectType() == 2).map(QualityInspect::getQuantity)
+ item.setFactoryNum(list.stream().filter(i -> i.getInspectType() == 2).map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add));
return item;
--
Gitblit v1.9.3