Browse Source

分页导出的bug

dev
jianjun 3 years ago
parent
commit
cca5361014
  1. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
  2. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java

4
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java

@ -94,7 +94,6 @@ public class IcBirthRecordController {
formDTO.setStaffId(tokenDto.getUserId()); formDTO.setStaffId(tokenDto.getUserId());
formDTO.setIsPage(false); formDTO.setIsPage(false);
formDTO.setPageSize(NumConstant.TEN_THOUSAND); formDTO.setPageSize(NumConstant.TEN_THOUSAND);
int pageNo = formDTO.getPageNo();
ExcelWriter excelWriter = null; ExcelWriter excelWriter = null;
AtomicInteger i = new AtomicInteger(1); AtomicInteger i = new AtomicInteger(1);
@ -110,7 +109,7 @@ public class IcBirthRecordController {
item.setIndex(i.getAndIncrement()); item.setIndex(i.getAndIncrement());
}); });
excelWriter.write(list, writeSheet); excelWriter.write(list, writeSheet);
formDTO.setPageNo(pageNo++); formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
} while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize()); } while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize());
} catch (Exception e) { } catch (Exception e) {
log.error("export exception", e); log.error("export exception", e);
@ -122,5 +121,4 @@ public class IcBirthRecordController {
} }
} }

4
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java

@ -95,7 +95,6 @@ public class IcMoveInRecordController {
formDTO.setIsPage(false); formDTO.setIsPage(false);
ExcelWriter excelWriter = null; ExcelWriter excelWriter = null;
formDTO.setPageSize(NumConstant.TEN_THOUSAND); formDTO.setPageSize(NumConstant.TEN_THOUSAND);
int pageNo = NumConstant.ONE;
try { try {
String fileName = "迁入管理" + DateUtils.format(new Date()) + ".xlsx"; String fileName = "迁入管理" + DateUtils.format(new Date()) + ".xlsx";
excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcMoveInRecordExcel.class).build(); excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcMoveInRecordExcel.class).build();
@ -105,7 +104,7 @@ public class IcMoveInRecordController {
do { do {
data = icMoveInRecordService.list(formDTO); data = icMoveInRecordService.list(formDTO);
list = ConvertUtils.sourceToTarget(data.getList(), IcMoveInRecordExcel.class); list = ConvertUtils.sourceToTarget(data.getList(), IcMoveInRecordExcel.class);
formDTO.setPageNo(++pageNo); formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
excelWriter.write(list, writeSheet); excelWriter.write(list, writeSheet);
} while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize());
} catch (Exception e) { } catch (Exception e) {
@ -125,5 +124,4 @@ public class IcMoveInRecordController {
} }
} }

Loading…
Cancel
Save