diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
index 8983e1f8c6..0dec64a35f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
@@ -48,23 +48,23 @@ public class IcBirthRecordController {
     private IcBirthRecordService icBirthRecordService;
 
     @RequestMapping("page")
-    @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){
+    @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) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         PageData<IcBirthRecordDTO> page = icBirthRecordService.page(formDTO);
         return new Result<PageData<IcBirthRecordDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<IcBirthRecordDTO> get(@PathVariable("id") String id){
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<IcBirthRecordDTO> get(@PathVariable("id") String id) {
         IcBirthRecordDTO data = icBirthRecordService.get(id);
         return new Result<IcBirthRecordDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @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);
         icBirthRecordService.save(tokenDto, dto);
@@ -73,7 +73,7 @@ public class IcBirthRecordController {
 
     @NoRepeatSubmit
     @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);
         icBirthRecordService.update(tokenDto, dto);
@@ -81,7 +81,7 @@ public class IcBirthRecordController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         icBirthRecordService.delete(ids);
@@ -94,7 +94,6 @@ public class IcBirthRecordController {
         formDTO.setStaffId(tokenDto.getUserId());
         formDTO.setIsPage(false);
         formDTO.setPageSize(NumConstant.TEN_THOUSAND);
-        int pageNo = formDTO.getPageNo();
 
         ExcelWriter excelWriter = null;
         AtomicInteger i = new AtomicInteger(1);
@@ -110,7 +109,7 @@ public class IcBirthRecordController {
                     item.setIndex(i.getAndIncrement());
                 });
                 excelWriter.write(list, writeSheet);
-                formDTO.setPageNo(pageNo++);
+                formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
             } while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize());
         } catch (Exception e) {
             log.error("export exception", e);
@@ -122,5 +121,4 @@ public class IcBirthRecordController {
     }
 
 
-
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java
index 6798bc40fd..cb8fc0f7a4 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java
@@ -50,22 +50,22 @@ public class IcMoveInRecordController {
     private IcMoveInRecordService icMoveInRecordService;
 
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<IcMoveInRecordDTO> get(@PathVariable("id") String id){
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<IcMoveInRecordDTO> get(@PathVariable("id") String id) {
         IcMoveInRecordDTO data = icMoveInRecordService.get(id);
         return new Result<IcMoveInRecordDTO>().ok(data);
     }
 
     @RequestMapping("list")
-    @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){
+    @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) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<PageData<IcMoveInListResultDTO>>().ok(icMoveInRecordService.list(formDTO));
     }
 
     @NoRepeatSubmit
     @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);
         dto.setCustomerId(tokenDto.getCustomerId());
         dto.setUserId(tokenDto.getUserId());
@@ -74,7 +74,7 @@ public class IcMoveInRecordController {
     }
 
     @PostMapping("edit")
-    public Result update(@RequestBody IcMoveInAddEditFormDTO dto){
+    public Result update(@RequestBody IcMoveInAddEditFormDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         icMoveInRecordService.update(dto);
@@ -82,7 +82,7 @@ public class IcMoveInRecordController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         icMoveInRecordService.delete(ids);
@@ -95,9 +95,8 @@ public class IcMoveInRecordController {
         formDTO.setIsPage(false);
         ExcelWriter excelWriter = null;
         formDTO.setPageSize(NumConstant.TEN_THOUSAND);
-        int pageNo = NumConstant.ONE;
         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();
             WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
             PageData<IcMoveInListResultDTO> data = null;
@@ -105,12 +104,12 @@ public class IcMoveInRecordController {
             do {
                 data = icMoveInRecordService.list(formDTO);
                 list = ConvertUtils.sourceToTarget(data.getList(), IcMoveInRecordExcel.class);
-                formDTO.setPageNo(++pageNo);
+                formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
                 excelWriter.write(list, writeSheet);
             } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize());
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("export exception", e);
-        }finally {
+        } finally {
             if (excelWriter != null) {
                 excelWriter.finish();
             }
@@ -118,12 +117,11 @@ public class IcMoveInRecordController {
     }
 
     @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);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<IcMoveInListResultDTO>().ok(icMoveInRecordService.detail(formDTO));
     }
 
 
-
 }