diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index 0bc1b4bf3..35972e90a 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java @@ -241,13 +241,7 @@ public class AuditServiceImpl extends ServiceImpl implem //计算一般情况下每一个Sheet需要写入的次数(一般情况不包含最后一个sheet,因为最后一个sheet不确定会写入多少条数据) int oneSheetWriteCount = sheetDataRows / writeDataRows; //计算最后一个sheet需要写入的次数 - int lastSheetWriteCount; - if (totalCount > sheetDataRows) { - lastSheetWriteCount = totalCount % sheetDataRows == 0 ? oneSheetWriteCount : (totalCount % sheetDataRows % writeDataRows == 0 ? (totalCount / sheetDataRows / writeDataRows) : (totalCount / sheetDataRows / writeDataRows + 1)); - } else { - lastSheetWriteCount = totalCount % sheetDataRows == 0 ? oneSheetWriteCount : oneSheetWriteCount + 1; - } - + int lastSheetWriteCount = totalCount % sheetDataRows == 0 ? oneSheetWriteCount : (totalCount % sheetDataRows % writeDataRows == 0 ? (totalCount / sheetDataRows / writeDataRows) : (totalCount / sheetDataRows / writeDataRows + 1)); //开始分批查询分次写入 for (int i = 0; i < sheetNum; i++) { @@ -265,7 +259,7 @@ public class AuditServiceImpl extends ServiceImpl implem } } catch (Exception e) { - redisUtil.delete("recoverLogFile"); + redisUtil.delete("logFileWriter"); e.printStackTrace(); } finally { excelWriter.finish();