luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

分页导出的bug

dev
jianjun 3 years ago
parent
1a28a10c52
commit
cca5361014
2 changed files with 20 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
  2. 26
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java

18
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
View File

@ -48,23 +48,23 @@ public class IcBirthRecordController {
private IcBirthRecordService icBirthRecordService; private IcBirthRecordService icBirthRecordService;
@RequestMapping("page") @RequestMapping("page")
@MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
public Result<PageData<IcBirthRecordDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO){ public Result<PageData<IcBirthRecordDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setStaffId(tokenDto.getUserId()); formDTO.setStaffId(tokenDto.getUserId());
PageData<IcBirthRecordDTO> page = icBirthRecordService.page(formDTO); PageData<IcBirthRecordDTO> page = icBirthRecordService.page(formDTO);
return new Result<PageData<IcBirthRecordDTO>>().ok(page); return new Result<PageData<IcBirthRecordDTO>>().ok(page);
} }
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<IcBirthRecordDTO> get(@PathVariable("id") String id){ public Result<IcBirthRecordDTO> get(@PathVariable("id") String id) {
IcBirthRecordDTO data = icBirthRecordService.get(id); IcBirthRecordDTO data = icBirthRecordService.get(id);
return new Result<IcBirthRecordDTO>().ok(data); return new Result<IcBirthRecordDTO>().ok(data);
} }
@NoRepeatSubmit @NoRepeatSubmit
@PostMapping("save") @PostMapping("save")
public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcBirthRecordDTO dto){ public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcBirthRecordDTO dto) {
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
icBirthRecordService.save(tokenDto, dto); icBirthRecordService.save(tokenDto, dto);
@ -73,7 +73,7 @@ public class IcBirthRecordController {
@NoRepeatSubmit @NoRepeatSubmit
@PostMapping("update") @PostMapping("update")
public Result update(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordUpdateDTO dto){ public Result update(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordUpdateDTO dto) {
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
icBirthRecordService.update(tokenDto, dto); icBirthRecordService.update(tokenDto, dto);
@ -81,7 +81,7 @@ public class IcBirthRecordController {
} }
@PostMapping("delete") @PostMapping("delete")
public Result delete(@RequestBody String[] ids){ public Result delete(@RequestBody String[] ids) {
//效验数据 //效验数据
AssertUtils.isArrayEmpty(ids, "id"); AssertUtils.isArrayEmpty(ids, "id");
icBirthRecordService.delete(ids); icBirthRecordService.delete(ids);
@ -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 {
} }
} }

26
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java
View File

@ -50,22 +50,22 @@ public class IcMoveInRecordController {
private IcMoveInRecordService icMoveInRecordService; private IcMoveInRecordService icMoveInRecordService;
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<IcMoveInRecordDTO> get(@PathVariable("id") String id){ public Result<IcMoveInRecordDTO> get(@PathVariable("id") String id) {
IcMoveInRecordDTO data = icMoveInRecordService.get(id); IcMoveInRecordDTO data = icMoveInRecordService.get(id);
return new Result<IcMoveInRecordDTO>().ok(data); return new Result<IcMoveInRecordDTO>().ok(data);
} }
@RequestMapping("list") @RequestMapping("list")
@MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
public Result<PageData<IcMoveInListResultDTO>> list(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO){ public Result<PageData<IcMoveInListResultDTO>> list(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setCustomerId(tokenDto.getCustomerId());
return new Result<PageData<IcMoveInListResultDTO>>().ok(icMoveInRecordService.list(formDTO)); return new Result<PageData<IcMoveInListResultDTO>>().ok(icMoveInRecordService.list(formDTO));
} }
@NoRepeatSubmit @NoRepeatSubmit
@PostMapping("add") @PostMapping("add")
public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInAddEditFormDTO dto){ public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInAddEditFormDTO dto) {
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setCustomerId(tokenDto.getCustomerId()); dto.setCustomerId(tokenDto.getCustomerId());
dto.setUserId(tokenDto.getUserId()); dto.setUserId(tokenDto.getUserId());
@ -74,7 +74,7 @@ public class IcMoveInRecordController {
} }
@PostMapping("edit") @PostMapping("edit")
public Result update(@RequestBody IcMoveInAddEditFormDTO dto){ public Result update(@RequestBody IcMoveInAddEditFormDTO dto) {
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
icMoveInRecordService.update(dto); icMoveInRecordService.update(dto);
@ -82,7 +82,7 @@ public class IcMoveInRecordController {
} }
@PostMapping("delete") @PostMapping("delete")
public Result delete(@RequestBody String[] ids){ public Result delete(@RequestBody String[] ids) {
//效验数据 //效验数据
AssertUtils.isArrayEmpty(ids, "id"); AssertUtils.isArrayEmpty(ids, "id");
icMoveInRecordService.delete(ids); icMoveInRecordService.delete(ids);
@ -95,9 +95,8 @@ 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();
WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
PageData<IcMoveInListResultDTO> data = null; PageData<IcMoveInListResultDTO> data = null;
@ -105,12 +104,12 @@ 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) {
log.error("export exception", e); log.error("export exception", e);
}finally { } finally {
if (excelWriter != null) { if (excelWriter != null) {
excelWriter.finish(); excelWriter.finish();
} }
@ -118,12 +117,11 @@ public class IcMoveInRecordController {
} }
@RequestMapping("detail") @RequestMapping("detail")
public Result<IcMoveInListResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO){ public Result<IcMoveInListResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setCustomerId(tokenDto.getCustomerId());
return new Result<IcMoveInListResultDTO>().ok(icMoveInRecordService.detail(formDTO)); return new Result<IcMoveInListResultDTO>().ok(icMoveInRecordService.detail(formDTO));
} }
} }

Write Preview
Loading…
Cancel
Save