From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期二, 19 四月 2022 16:32:21 +0800 Subject: [PATCH] 花城E+防疫修改 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java index 778f5c2..46677b3 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java @@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; /** @@ -14,27 +15,29 @@ @Data public class ComPbMemberExcelVO { - @ExcelProperty(value = "党员姓名", index = 0) - private String comName; + @ExcelProperty(value = "账号", index = 0) + private String phone; - @ExcelProperty(value = "身份证号", index = 1) - private String idCard; + @ExcelProperty(value = "党员姓名", index = 1) + private String name; @ExcelProperty(value = "所属党组织", index = 2) private String orgName; @ExcelProperty(value = "入党日期", index = 3) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date joinTime; @ExcelProperty(value = "转正日期", index = 4) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date employmentTime; - @ExcelProperty(value = "所属社区", index = 5) - private String communityName; - - @ExcelProperty(value = "报道单位", index = 6) + @ExcelProperty(value = "报道单位", index = 5) private String checkUnitName; - @ExcelProperty(value = "党龄", index = 7) + @ExcelProperty(value = "党龄", index = 6) private Integer partyAge; + + @ExcelProperty(value = "状态",index = 7) + private String status; } -- Gitblit v1.7.1