From 5bc0e587dc5dd7ca40f4285eed966429e69535e7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 十二月 2024 10:54:49 +0800
Subject: [PATCH] 检验任务添加一个撤销的功能(如果已经提交的撤销)
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 e85943f..0b89ae0 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,18 +202,19 @@
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)) {
for (AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay : auxiliaryWorkingHoursDays) {
- sumApprovedWorkingHour += auxiliaryWorkingHoursDay.getNonproductiveTime();
+ sumApprovedWorkingHour += auxiliaryWorkingHoursDay.getReviewerNonproductiveTime();//澶嶆牳宸ユ椂
}
}
map.put("杈呭姪宸ユ椂姹囨��", sumApprovedWorkingHour);
@@ -247,7 +248,9 @@
ids = users.stream().map(User::getId).distinct().collect(Collectors.toList());
}
}
-
+ if (ids.size()==0){
+ ids=null;
+ }
//鏌ヨ杈呭姪宸ユ椂
auxiliaryWorkingHoursDayDtos = auxiliaryWorkingHoursDayMapper.selectDataByUser(ids);
//鏌ヨ缁熻宸ユ椂
--
Gitblit v1.9.3