From bccaf7e7d0b50ff9df3120c38193d77d60fe26eb Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 16 七月 2025 14:46:00 +0800 Subject: [PATCH] art: 技术状态鉴定工单变更-提交、作废,审批接口添加 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java index 4d4d140..f0fb0db 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java @@ -2087,7 +2087,12 @@ private MdcEfficiencyResultDto effRate(List<MdcEfficiencyDto> efficiencyList, String date, String equipmentId) { MdcEfficiencyResultDto mdcEfficiencyResultDto = new MdcEfficiencyResultDto(); if (efficiencyList != null && !efficiencyList.isEmpty()) { - Map<String, MdcEfficiencyDto> collect = efficiencyList.stream().collect(Collectors.toMap(dto -> dto.getEquipmentId() + "_" + dto.getTheDate(), dto -> dto)); + Map<String, MdcEfficiencyDto> collect = new HashMap<>(); + efficiencyList.forEach(mdcEfficiencyDto -> { + if (!collect.containsKey(mdcEfficiencyDto.getEquipmentId() + "_" + mdcEfficiencyDto.getTheDate())) { + collect.put(mdcEfficiencyDto.getEquipmentId() + "_" + mdcEfficiencyDto.getTheDate(), mdcEfficiencyDto); + } + }); if (collect.containsKey(equipmentId + "_" + date)) { MdcEfficiencyDto efficiencyDto = collect.get(equipmentId + "_" + date); mdcEfficiencyResultDto.setTheDate(efficiencyDto.getTheDate()); -- Gitblit v1.9.3