diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java
index 651006e93..2856b2102 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java
@@ -161,13 +161,12 @@ public class SarFileCompareItemCommentController extends JeroController exportResXls(@RequestParam(name = "infoId", required = true) String infoId,
+ public void exportResXls(@RequestParam(name = "infoId", required = true) String infoId,
@RequestParam(name = "selectIds", required = true) String selectIds,
@RequestParam(name = "includeComments", required = true) boolean includeComments,
@RequestParam(name = "cut", required = true) String cut,
HttpServletResponse response) {
sarFileCompareItemCommentService.exportResXls(response, infoId, selectIds, includeComments, cut);
- return Result.OK();
}
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
index 61c51b882..032e45072 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
@@ -188,7 +188,13 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl", "").replace("
", "\r\n");
row.createCell(2).setCellValue(text);
+ row.setRowStyle(cellStyle);
}
}
String itemIdRight = itemComment.getItemsIdRight();
- SarFileCompareItem itemRight = sfcItemMap.get(itemIdRight);
- if (null != itemRight) {
- row.createCell(3).setCellValue(itemRight.getItemsNum());
- row.createCell(4).setCellValue(itemRight.getItemsName());
- String text = itemRight.getItemsText();
- text = text.replace("", "").replace("
", "\r\n");
- row.createCell(5).setCellValue(text);
+ if (!StringUtils.isEmpty(itemIdRight)) {
+ SarFileCompareItem itemRight = sfcItemMap.get(itemIdRight);
+ if (null != itemRight) {
+ row.createCell(3).setCellValue(itemRight.getItemsNum());
+ row.createCell(4).setCellValue(itemRight.getItemsName());
+ String text = itemRight.getItemsText();
+ text = text.replace("", "").replace("
", "\r\n");
+ row.createCell(5).setCellValue(text);
+ row.setRowStyle(cellStyle);
+ }
}
row.createCell(6).setCellValue(itemComment.getComment());
+ for (int j = 0; j < 7; j++) {
+ Cell cell = row.getCell(j);
+ if (null != cell) {
+ cell.setCellStyle(cellStyle);
+ }
+ }
i++;
}
if (includeComments || StringUtils.isEmpty(selectIds)) {
@@ -245,13 +264,10 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl