From 74ea5e11f4192eefa703c9abac2e73a815f989f7 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 11 May 2022 18:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=94=9F=E5=92=8C=E8=BF=81=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=87=BA=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/IcBirthRecordController.java   |  1 +
 .../com/epmet/excel/IcMoveInRecordExcel.java  |  9 +++++++--
 .../impl/IcBirthRecordServiceImpl.java        |  4 ++--
 .../impl/IcMoveInRecordServiceImpl.java       | 19 +++++++------------
 4 files changed, 17 insertions(+), 16 deletions(-)

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 177bbc42be..8983e1f8c6 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
@@ -110,6 +110,7 @@ public class IcBirthRecordController {
                     item.setIndex(i.getAndIncrement());
                 });
                 excelWriter.write(list, writeSheet);
+                formDTO.setPageNo(pageNo++);
             } while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize());
         } catch (Exception e) {
             log.error("export exception", e);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java
index b3ee1398bd..192ce17cd3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java
@@ -3,9 +3,12 @@ package com.epmet.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadStyle;
+import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -14,9 +17,11 @@ import java.util.Date;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-09
  */
+@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44)
 @Data
-public class IcMoveInRecordExcel {
+public class IcMoveInRecordExcel implements Serializable {
 
+    private static final long serialVersionUID = -12110233388005838L;
     @ExcelProperty(value = "姓名")
     @Excel(name = "姓名")
     private String name;
@@ -80,4 +85,4 @@ public class IcMoveInRecordExcel {
     private String householderRelationName;
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
index 800f4b7829..c3225149ad 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
@@ -70,7 +70,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
             throw new EpmetException("获取工作人员信息失败");
         }
 
-        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
         LambdaQueryWrapper<IcBirthRecordEntity> wrapper = getWrapper(formDTO, staffInfo);
         List<IcBirthRecordEntity> entityList = baseDao.selectList(wrapper);
         PageInfo<IcBirthRecordEntity> pageInfo = new PageInfo<>(entityList);
@@ -283,4 +283,4 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
         icUserTransferRecordService.moveResi(transfer);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
index 30a66373c3..e4e4f3ff64 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
@@ -79,17 +79,12 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
     @Override
     public IcMoveInListResultDTO list(IcMoveInListFormDTO formDTO) {
         IcMoveInListResultDTO resultDTO = new IcMoveInListResultDTO();
-        //导出查询
-        if (formDTO.getIsPage()) {
-            List<IcMoveInListResultDTO.IcMoveInList> list = baseDao.selectMoveInList(formDTO);
-            resultDTO.setList(list);
-        } else {
-            //列表查询
-            PageInfo<IcMoveInListResultDTO.IcMoveInList> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize())
-                    .doSelectPageInfo(() -> baseDao.selectMoveInList(formDTO));
-            resultDTO.setTotal((int) data.getTotal());
-            resultDTO.setList(data.getList());
-        }
+        //列表/导出查询
+        PageInfo<IcMoveInListResultDTO.IcMoveInList> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
+                .doSelectPageInfo(() -> baseDao.selectMoveInList(formDTO));
+        resultDTO.setTotal((int) data.getTotal());
+        resultDTO.setList(data.getList());
+
         //查询封装房屋信息
         if (!CollectionUtils.isEmpty(resultDTO.getList())) {
             Map<String, String> map = new HashMap<>();
@@ -295,4 +290,4 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
         return resultDTO;
     }
 
-}
\ No newline at end of file
+}