From 09101577baa4b844e308238d1d4ac1972d660577 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 十二月 2025 16:47:22 +0800
Subject: [PATCH] 生成站点电路试验报告(天线)合并单元格
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
index 00943f6..81202f6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
@@ -392,7 +392,10 @@
.between(AuxiliaryOutputWorkingHours::getCreateTime, start, end));
double sum = auxiliaryOutputWorkingHours.stream()
.filter(auxiliaryOutputWorkingHours1 ->
- insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId()).getSonLaboratory().equals(sonLaboratory)
+ {
+ InsProduct insProduct = insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId());
+ return ObjectUtils.isNotNull(insProduct)&&insProduct.getSonLaboratory().equals(sonLaboratory);
+ }
).mapToDouble(AuxiliaryOutputWorkingHours::getOutputWorkTime).sum();
String num = String.format("%.2f", sum);
return num;
@@ -410,7 +413,10 @@
//鏍规嵁妫�楠岄」鏌ュ嚭鏉ョ殑绔欑偣杩涜鍒嗙被
List<AuxiliaryOutputWorkingHours> outputWorkingHours = auxiliaryOutputWorkingHours.stream()
.filter(auxiliaryOutputWorkingHours1 ->
- insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId()).getSonLaboratory().equals(sonLaboratory)
+ {
+ InsProduct insProduct = insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId());
+ return ObjectUtils.isNotNull(insProduct)&&insProduct.getSonLaboratory().equals(sonLaboratory);
+ }
).collect(Collectors.toList());
Map<Object, Double> mapMap = outputWorkingHours.stream()
.collect(Collectors.groupingBy(
--
Gitblit v1.9.3