模版导出

This commit is contained in:
hzj
2025-10-11 16:02:34 +08:00
parent 199836779c
commit ad49c9af47

View File

@@ -178,6 +178,7 @@ public class EasyPoiWordExportServiceImpl implements EasyPoiWordExportService {
List<String> areaContentList = new ArrayList<>();
List<Map<String,Object>> eventTemplateList = new ArrayList<>();
List<Map<String, Object>> 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<String,Object> 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);