模版导出

This commit is contained in:
hzj
2025-10-11 13:39:11 +08:00
parent 90b2589641
commit 115b79e779

View File

@@ -204,7 +204,7 @@ public class EasyPoiWordExportServiceImpl implements EasyPoiWordExportService {
} }
List<PqsEventdetail> pqsEventdetailList = pqsEventdetailMapper.selectList(lambdaQueryWrapper); List<PqsEventdetail> pqsEventdetailList = pqsEventdetailMapper.selectList(lambdaQueryWrapper);
if(CollectionUtils.isEmpty(pqsEventdetailList)){ if(CollectionUtils.isEmpty(pqsEventdetailList)){
areaContent = deptName+"共监测到电压暂降事件0条"; areaContent = deptName+"共监测到电压暂降事件0条";
}else { }else {
Integer eveCount = pqsEventdetailList.size(); Integer eveCount = pqsEventdetailList.size();
@@ -252,6 +252,9 @@ public class EasyPoiWordExportServiceImpl implements EasyPoiWordExportService {
PqsEventdetail pqsEventdetail = pqsEventdetailList.get(i); PqsEventdetail pqsEventdetail = pqsEventdetailList.get(i);
List<LedgerBaseInfoDTO> baseLineInfo = pqLineMapper.getBaseLineInfo(Stream.of(pqsEventdetailList.get(i).getLineid()).collect(Collectors.toList())); List<LedgerBaseInfoDTO> baseLineInfo = pqLineMapper.getBaseLineInfo(Stream.of(pqsEventdetailList.get(i).getLineid()).collect(Collectors.toList()));
if(Objects.isNull(baseLineInfo.get(0).getObjName())){
continue;
}
String[] split = baseLineInfo.get(0).getObjName().split(";"); String[] split = baseLineInfo.get(0).getObjName().split(";");
for (int i1 = 0; i1 < split.length; i1++) { for (int i1 = 0; i1 < split.length; i1++) {
if(companyNameList.contains(split[i1])){ if(companyNameList.contains(split[i1])){
@@ -309,7 +312,7 @@ public class EasyPoiWordExportServiceImpl implements EasyPoiWordExportService {
areaContentList.add(areaContent); areaContentList.add(areaContent);
}); });
// 或者直接使用 \n // 或者直接使用 \n
String result2 = String.join("\n", areaContentList); String result2 = String.join("\r\n ", areaContentList);
bjReportDTO.setAreaContent(result2); bjReportDTO.setAreaContent(result2);
eventTemplateList.sort(Comparator.comparing(map -> (String) map.get("userName"))); eventTemplateList.sort(Comparator.comparing(map -> (String) map.get("userName")));