| | |
|---|
| | | 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)) { |
|---|
| | |
|---|
| | | ids = users.stream().map(User::getId).distinct().collect(Collectors.toList()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (ids.size()==0){ |
|---|
| | | ids=null; |
|---|
| | | } |
|---|
| | | //查询辅助工时 |
|---|
| | | auxiliaryWorkingHoursDayDtos = auxiliaryWorkingHoursDayMapper.selectDataByUser(ids); |
|---|
| | | //查询统计工时 |
|---|
