Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of

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);

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java

@@ -6,6 +6,8 @@ import com.alibaba.excel.annotation.write.style.HeadStyle;
 import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 出生管理
  *
@@ -14,8 +16,9 @@ import lombok.Data;
  */
 @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44)
 @Data
-public class IcBirthRecordExcel {
+public class IcBirthRecordExcel implements Serializable {
 
+    private static final long serialVersionUID = 4539449621014654213L;
     @ColumnWidth(10)
     @ExcelProperty(value = "序号",order = 1)
     private Integer index;

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcMoveInRecordExcel.java

@@ -2,10 +2,13 @@ package com.epmet.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.write.style.HeadStyle;
+import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -14,11 +17,14 @@ 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 = "姓名")
+    @ColumnWidth(20)
     private String name;
 
     @ExcelProperty(value = "所属网格")
@@ -32,11 +38,11 @@ public class IcMoveInRecordExcel {
     private String allName;
 
     @ExcelProperty(value = "手机号")
-    @Excel(name = "手机号")
+    @ColumnWidth(20)
     private String mobile;
 
     @ExcelProperty(value = "身份证号")
-    @ColumnWidth(20)
+    @ColumnWidth(25)
     @Excel(name = "身份证号")
     private String idCard;
 
@@ -51,7 +57,7 @@ public class IcMoveInRecordExcel {
     @ExcelProperty(value = "迁入时间")
     @ColumnWidth(20)
     @Excel(name = "迁入时间")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat("yyyy-MM-dd")
     private Date inTime;
 
     @ExcelProperty(value = "迁入原因")

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);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java

@@ -80,17 +80,12 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
     @Override
     public IcMoveInListResultDTO list(IcMoveInListFormDTO formDTO) {
         IcMoveInListResultDTO resultDTO = new IcMoveInListResultDTO();
-        //导出查询
+        //列表/导出查询
-        if (formDTO.getIsPage()) {
+        PageInfo<IcMoveInListResultDTO.IcMoveInList> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
-            List<IcMoveInListResultDTO.IcMoveInList> list = baseDao.selectMoveInList(formDTO);
+                .doSelectPageInfo(() -> baseDao.selectMoveInList(formDTO));
-            resultDTO.setList(list);
+        resultDTO.setTotal((int) data.getTotal());
-        } else {
+        resultDTO.setList(data.getList());
-            //列表查询
+
-            PageInfo<IcMoveInListResultDTO.IcMoveInList> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize())
-                    .doSelectPageInfo(() -> baseDao.selectMoveInList(formDTO));
-            resultDTO.setTotal((int) data.getTotal());
-            resultDTO.setList(data.getList());
-        }
         //查询封装房屋信息
         if (!CollectionUtils.isEmpty(resultDTO.getList())) {
             Map<String, String> map = new HashMap<>();