From 996c3fb89b185eedf2fd58a6c5bd5586e04cdccf Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 八月 2025 17:47:01 +0800
Subject: [PATCH] 电路试验,不同频段的要求值可以进行调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 f061cc7..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(
@@ -432,9 +438,11 @@
}else {
List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery()
.between(InsOrderState::getCreateTime, start, end));
- for (InsOrderState insOrderState : insOrderStates) {
- IPage<InsOrderUserDto> insOrderUserDtoIPage = insOrderUserMapper.selectInsOrderUserDto2(insOrderState.getId(), page);
- map.put(insOrderState.getLaboratory(), insOrderUserDtoIPage);
+ Map<String, List<InsOrderState>> listMap = insOrderStates.stream().collect(Collectors.groupingBy(InsOrderState::getLaboratory));
+ for (Map.Entry<String, List<InsOrderState>> entry : listMap.entrySet()) {
+ List<Integer> ids = entry.getValue().stream().map(InsOrderState::getId).collect(Collectors.toList());
+ IPage<InsOrderUserDto> insOrderUserDtoIPage = insOrderUserMapper.selectInsOrderUserDto2(ids, new Page(1,9));
+ map.put(entry.getKey(), insOrderUserDtoIPage);
}
}
return map;
--
Gitblit v1.9.3