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);