WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

上报库导出明细，带历史Log-处理空指针。

Browse Source
This commit is contained in:
wangzhijiang
2022-12-12 20:58:52 +08:00
parent d80860f28e
commit ebce07b8a4
1 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+40 -32
View File
@@ -675,7 +675,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
} }
// 导出参数明细历史 // 导出参数明细历史
this.exportParamsReportDetailLog(paramsReportDetailVO.getCut(), workbook, sheetHistoryName, allParamsInfoList,cellStyle1,cellStyle); if(CollectionUtils.isNotEmpty(allParamsInfoList)){
this.exportParamsReportDetailLog(paramsReportDetailVO.getCut(), workbook, sheetHistoryName, allParamsInfoList,cellStyle1,cellStyle);
}
//下载关联文件内容 //下载关联文件内容
if (allRelevFileList != null && !allRelevFileList.isEmpty()) { if (allRelevFileList != null && !allRelevFileList.isEmpty()) {
allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList()); allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList());
@@ -770,41 +772,47 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
sheetHistory.setColumnWidth(i, 20 * 256); sheetHistory.setColumnWidth(i, 20 * 256);
} }
} }
// 查询历史log信息
List<String> detailIdList = allParamsInfoList.stream().map(e -> e.get("id").toString()).distinct().collect(Collectors.toList());
QueryWrapper<ParamsReportDetailLogEO> detailLogQueryWrap = new QueryWrapper<>();
detailLogQueryWrap.lambda().in(ParamsReportDetailLogEO::getParamsReportDetailId,detailIdList);
detailLogQueryWrap.orderByDesc("params_report_detail_id");
List<ParamsReportDetailLogEO> detailLogList = this.paramsReportDetailLogEOService.list(detailLogQueryWrap);
if (CollectionUtils.isNotEmpty(detailLogList)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
int historyRowNumber = 1; if (CollectionUtils.isNotEmpty(allParamsInfoList)) {
for (int i = 0; i < detailLogList.size(); i++) { // 查询历史log信息
String paramsReportDetailId = detailLogList.get(i).getParamsReportDetailId(); List<String> detailIdList = allParamsInfoList.stream().map(e -> e.get("id").toString()).distinct().collect(Collectors.toList());
String nioNumber = allParamsInfoList.stream().filter(paramsInfo -> { if(CollectionUtils.isNotEmpty(detailIdList)){
boolean flag = false; QueryWrapper<ParamsReportDetailLogEO> detailLogQueryWrap = new QueryWrapper<>();
if(StringUtils.equals(paramsInfo.get("id").toString(),paramsReportDetailId)){ detailLogQueryWrap.lambda().in(ParamsReportDetailLogEO::getParamsReportDetailId,detailIdList);
flag = true; detailLogQueryWrap.orderByDesc("params_report_detail_id");
List<ParamsReportDetailLogEO> detailLogList = this.paramsReportDetailLogEOService.list(detailLogQueryWrap);
if (CollectionUtils.isNotEmpty(detailLogList)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
int historyRowNumber = 1;
for (int i = 0; i < detailLogList.size(); i++) {
String paramsReportDetailId = detailLogList.get(i).getParamsReportDetailId();
String nioNumber = allParamsInfoList.stream().filter(paramsInfo -> {
boolean flag = false;
if(StringUtils.equals(paramsInfo.get("id").toString(),paramsReportDetailId)){
flag = true;
}
return flag;
}).map(e -> e.get("nio_number").toString()).distinct().collect(Collectors.toList()).get(0);
String operatorDetails = detailLogList.get(i).getLogCnContent();
String operatorTime = sdf.format(detailLogList.get(i).getCreateTime());
if(StringUtils.equals(cut,CutEnum.EN.getValue())){
operatorDetails = detailLogList.get(i).getLogEnContent();
}
XSSFRow row1 = sheetHistory.createRow(historyRowNumber);
row1.createCell(0).setCellValue(nioNumber);
row1.createCell(1).setCellValue(operatorDetails);
row1.createCell(2).setCellValue(detailLogList.get(i).getRemarks());
row1.createCell(3).setCellValue(operatorTime);
for (int j = 0; j < 4; j++) {
row1.getCell(j).setCellStyle(bodyCellStyle);
}
historyRowNumber ++;
} }
return flag;
}).map(e -> e.get("nio_number").toString()).distinct().collect(Collectors.toList()).get(0);
String operatorDetails = detailLogList.get(i).getLogCnContent();
String operatorTime = sdf.format(detailLogList.get(i).getCreateTime());
if(StringUtils.equals(cut,CutEnum.EN.getValue())){
operatorDetails = detailLogList.get(i).getLogEnContent();
} }
XSSFRow row1 = sheetHistory.createRow(historyRowNumber);
row1.createCell(0).setCellValue(nioNumber);
row1.createCell(1).setCellValue(operatorDetails);
row1.createCell(2).setCellValue(detailLogList.get(i).getRemarks());
row1.createCell(3).setCellValue(operatorTime);
for (int j = 0; j < 4; j++) {
row1.getCell(j).setCellStyle(bodyCellStyle);
}
historyRowNumber ++;
} }
} }
} }