From 74ea5e11f4192eefa703c9abac2e73a815f989f7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 18:03:19 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=87=BA=E7=94=9F=E5=92=8C=E8=BF=81?= =?UTF-8?q?=E5=85=A5=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 wrapper = getWrapper(formDTO, staffInfo); List entityList = baseDao.selectList(wrapper); PageInfo pageInfo = new PageInfo<>(entityList); @@ -283,4 +283,4 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl list = baseDao.selectMoveInList(formDTO); - resultDTO.setList(list); - } else { - //列表查询 - PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()) - .doSelectPageInfo(() -> baseDao.selectMoveInList(formDTO)); - resultDTO.setTotal((int) data.getTotal()); - resultDTO.setList(data.getList()); - } + //列表/导出查询 + PageInfo 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 map = new HashMap<>(); @@ -295,4 +290,4 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl Date: Wed, 11 May 2022 18:15:25 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=97=B6=E9=97=B4=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcMoveInRecordExcel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 192ce17cd3..370dc9b4b1 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 @@ -5,8 +5,8 @@ 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 org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -56,7 +56,7 @@ public class IcMoveInRecordExcel implements Serializable { @ExcelProperty(value = "迁入时间") @ColumnWidth(20) @Excel(name = "迁入时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date inTime; @ExcelProperty(value = "迁入原因") From da805f0e8e38474ac8da11f592d75f96e49aa24a Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 18:22:37 +0800 Subject: [PATCH 3/6] =?UTF-8?q?Revert=20"=E8=BF=81=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E6=97=B6=E9=97=B4=E4=B8=8D=E5=AF=B9?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 66b83f3c --- .../src/main/java/com/epmet/excel/IcMoveInRecordExcel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 370dc9b4b1..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 @@ -5,8 +5,8 @@ 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 org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -56,7 +56,7 @@ public class IcMoveInRecordExcel implements Serializable { @ExcelProperty(value = "迁入时间") @ColumnWidth(20) @Excel(name = "迁入时间") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date inTime; @ExcelProperty(value = "迁入原因") From 427ca1d9e303f35f936137a0f9c9163ae6b0c406 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 18:24:22 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=97=B6=E9=97=B4=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcMoveInRecordExcel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 192ce17cd3..26edb423ce 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 @@ -2,10 +2,10 @@ 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.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; @@ -56,7 +56,7 @@ public class IcMoveInRecordExcel implements Serializable { @ExcelProperty(value = "迁入时间") @ColumnWidth(20) @Excel(name = "迁入时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat("yyyy-MM-dd") private Date inTime; @ExcelProperty(value = "迁入原因") From 4e08ce53ee50f67afd8e1f4d7f0ef535f3b44773 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 18:30:09 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcMoveInRecordExcel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 26edb423ce..4976970ffa 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 @@ -24,6 +24,7 @@ public class IcMoveInRecordExcel implements Serializable { private static final long serialVersionUID = -12110233388005838L; @ExcelProperty(value = "姓名") @Excel(name = "姓名") + @ColumnWidth(20) private String name; @ExcelProperty(value = "所属网格") @@ -37,11 +38,11 @@ public class IcMoveInRecordExcel implements Serializable { private String allName; @ExcelProperty(value = "手机号") - @Excel(name = "手机号") + @ColumnWidth(20) private String mobile; @ExcelProperty(value = "身份证号") - @ColumnWidth(20) + @ColumnWidth(25) @Excel(name = "身份证号") private String idCard; From 908409ae97f5753ff239c68b03954008437158a0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 18:30:50 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcBirthRecordExcel.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java index fc20ac93ef..130cde401e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java +++ b/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; @@ -72,4 +75,4 @@ public class IcBirthRecordExcel { @ExcelProperty(value = "与户主关系",order = 1) private String householderRelation; -} \ No newline at end of file +}