From 1f15333b0a97a327865f7aab8f1e3f9ba8fc16f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 十月 2024 12:45:59 +0800
Subject: [PATCH] 电路站点报告调试+总报告ing

---
 performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
index 131200a..8ddd353 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
@@ -202,13 +202,14 @@
             auxiliaryWorkingHoursDays = auxiliaryWorkingHoursDayMapper.selectListByIds(ids);
         }
         if (ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHours)) {
-            Map<String, Double> sumMap = new HashMap<>();
+//            Map<String, Double> sumMap = new HashMap<>();
             for (AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHour : auxiliaryOutputWorkingHours) {
-                if (!sumMap.containsKey(auxiliaryOutputWorkingHour.getManHourGroup()+auxiliaryOutputWorkingHour.getOrderNo()+auxiliaryOutputWorkingHour.getSample())) {
+               /* if (!sumMap.containsKey(auxiliaryOutputWorkingHour.getManHourGroup()+auxiliaryOutputWorkingHour.getOrderNo()+auxiliaryOutputWorkingHour.getSample())) {
                     sumMap.put(auxiliaryOutputWorkingHour.getManHourGroup()+auxiliaryOutputWorkingHour.getOrderNo()+auxiliaryOutputWorkingHour.getSample(), auxiliaryOutputWorkingHour.getOutputWorkTime());
-                }
+                }*/
+                sumOutputWorkTime+=auxiliaryOutputWorkingHour.getOutputWorkTime();
             }
-            sumOutputWorkTime = sumMap.values().stream().mapToDouble(Double::doubleValue).sum();
+//            sumOutputWorkTime = sumMap.values().stream().mapToDouble(Double::doubleValue).sum();
         }
         map.put("浜ч噺宸ユ椂姹囨��", sumOutputWorkTime);
         if (ObjectUtils.isNotEmpty(auxiliaryWorkingHoursDays)) {

--
Gitblit v1.9.3