Merge branch '84-integrate' into 'develop'

develop-20230201



1. 调整文件换行符

2. 报表bug修复



See merge request !29

smsb-customer-manager-adapter/src/main/java/com/inspur/customer/utils/EasyExcelUtil.java

@@ -75,16 +75,18 @@ public class EasyExcelUtil {
         contentWriteCellStyle.setBorderTop(BorderStyle.THIN);
         // 这个策略是 头是头的样式 内容是内容的样式 其他的策略可以自己实现
         HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
-        ExcelWriterSheetBuilder excelWriterSheetBuilder = EasyExcelFactory.write(getOutputStream(fileName, response), model).excelType(ExcelTypeEnum.XLSX).sheet(sheetName);
-        if (writeHandlerList != null && !writeHandlerList.isEmpty()) {
-            for (WriteHandler writeHandler : writeHandlerList) {
-                excelWriterSheetBuilder.registerWriteHandler(writeHandler);
+        try (OutputStream outputStream = getOutputStream(fileName, response)) {
+            ExcelWriterSheetBuilder excelWriterSheetBuilder = EasyExcelFactory.write(outputStream, model).excelType(ExcelTypeEnum.XLSX).sheet(sheetName);
+            if (writeHandlerList != null && !writeHandlerList.isEmpty()) {
+                for (WriteHandler writeHandler : writeHandlerList) {
+                    excelWriterSheetBuilder.registerWriteHandler(writeHandler);
+                }
             }
+            if (putExportTimeToHead) {
+                excelWriterSheetBuilder.head(getHeadWithExportTime(model));
+            }
+            excelWriterSheetBuilder.registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).doWrite(data);
         }
-        if (putExportTimeToHead) {
-            excelWriterSheetBuilder.head(getHeadWithExportTime(model));
-        }
-        excelWriterSheetBuilder.registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).doWrite(data);
     }
 
     public static void writeExcel(HttpServletResponse response, List<? extends Object> data, String fileName, String sheetName, List<List<String>> head, List<WriteHandler> writeHandlerList, boolean putExportTimeToHead) throws Exception {
@@ -113,16 +115,18 @@ public class EasyExcelUtil {
         contentWriteCellStyle.setBorderTop(BorderStyle.THIN);
         // 这个策略是 头是头的样式 内容是内容的样式 其他的策略可以自己实现
         HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
-        ExcelWriterSheetBuilder excelWriterSheetBuilder = EasyExcelFactory.write(getOutputStream(fileName, response)).excelType(ExcelTypeEnum.XLSX).sheet(sheetName);
-        if (writeHandlerList != null && !writeHandlerList.isEmpty()) {
-            for (WriteHandler writeHandler : writeHandlerList) {
-                excelWriterSheetBuilder.registerWriteHandler(writeHandler);
+        try (OutputStream outputStream = getOutputStream(fileName, response)) {
+            ExcelWriterSheetBuilder excelWriterSheetBuilder = EasyExcelFactory.write(outputStream).excelType(ExcelTypeEnum.XLSX).sheet(sheetName);
+            if (writeHandlerList != null && !writeHandlerList.isEmpty()) {
+                for (WriteHandler writeHandler : writeHandlerList) {
+                    excelWriterSheetBuilder.registerWriteHandler(writeHandler);
+                }
             }
+            if (putExportTimeToHead) {
+                excelWriterSheetBuilder.head(getHeadWithExportTime(head));
+            }
+            excelWriterSheetBuilder.registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).doWrite(data);
         }
-        if (putExportTimeToHead) {
-            excelWriterSheetBuilder.head(getHeadWithExportTime(head));
-        }
-        excelWriterSheetBuilder.registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).doWrite(data);
     }
 
     /**