From ad49c9af47c0606ac15f16a03f88bc34bd94a3c0 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Sat, 11 Oct 2025 16:02:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=89=88=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/EasyPoiWordExportServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/event_smart/src/main/java/com/njcn/product/event/report/service/impl/EasyPoiWordExportServiceImpl.java b/event_smart/src/main/java/com/njcn/product/event/report/service/impl/EasyPoiWordExportServiceImpl.java index 1546aa4..a12ec81 100644 --- a/event_smart/src/main/java/com/njcn/product/event/report/service/impl/EasyPoiWordExportServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/product/event/report/service/impl/EasyPoiWordExportServiceImpl.java @@ -178,6 +178,7 @@ public class EasyPoiWordExportServiceImpl implements EasyPoiWordExportService { List areaContentList = new ArrayList<>(); List> eventTemplateList = new ArrayList<>(); + List> finalEventTemplateList = eventTemplateList; param.getDeptList().forEach(deptId->{ String deptName = deptMap.get(deptId); @@ -270,7 +271,7 @@ public class EasyPoiWordExportServiceImpl implements EasyPoiWordExportService { eventTemplate.setResidualVoltage(String.format("%.2f",pqsEventdetail.getEventvalue()*100)); eventTemplate.setUserName(split[i1]); Map eventMap = mapper.convertValue(eventTemplate,Map.class); - eventTemplateList.add(eventMap); + finalEventTemplateList.add(eventMap); } } @@ -316,6 +317,7 @@ public class EasyPoiWordExportServiceImpl implements EasyPoiWordExportService { // 或者直接使用 \n String result2 = String.join("\r\n ", areaContentList); bjReportDTO.setAreaContent(result2); + eventTemplateList = eventTemplateList.stream().distinct().collect(Collectors.toList()); eventTemplateList.sort(Comparator.comparing(map -> (String) map.get("userName"))); bjReportDTO.setCompanyEvent(eventTemplateList);