From ebce07b8a4ecd631f3946244a3f8bb0083d8cc54 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 12 Dec 2022 20:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=8C=E5=B8=A6=E5=8E=86=E5=8F=B2Log-?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A9=BA=E6=8C=87=E9=92=88=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsReportDetailEOServiceImpl.java | 72 ++++++++++---------
 1 file changed, 40 insertions(+), 32 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 0fdfa60e5..dade0f196 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -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()) {
 				allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList());
@@ -770,41 +772,47 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				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;
-			for (int i = 0; i < detailLogList.size(); i++) {
-				String paramsReportDetailId = detailLogList.get(i).getParamsReportDetailId();
+		if (CollectionUtils.isNotEmpty(allParamsInfoList)) {
+			// 查询历史log信息
+			List<String> detailIdList = allParamsInfoList.stream().map(e -> e.get("id").toString()).distinct().collect(Collectors.toList());
 
-				String nioNumber = allParamsInfoList.stream().filter(paramsInfo -> {
-					boolean flag = false;
-					if(StringUtils.equals(paramsInfo.get("id").toString(),paramsReportDetailId)){
-						flag = true;
+			if(CollectionUtils.isNotEmpty(detailIdList)){
+				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;
+					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 ++;
 			}
 		}
 	}