From ed888960f1bcba0cbf0f801e50f5fca981c33ee0 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 24 May 2022 15:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/IcPartyMemberImportExcel.java | 3 +-- .../handler/IcPartyMemberImportListener.java | 4 ++-- .../service/impl/IcPartyMemberServiceImpl.java | 17 +++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java index 245e97a52d..ac937ae045 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java @@ -6,7 +6,6 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; -import java.util.Date; /** * 核酸检测信息导入excel数据 @@ -34,7 +33,7 @@ public class IcPartyMemberImportExcel { private String idCard; @ExcelProperty("地址") - private Date address; + private String address; @ExcelProperty("入党时间") private String rdsj; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/handler/IcPartyMemberImportListener.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/handler/IcPartyMemberImportListener.java index 74161c69f9..108b42a8ab 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/handler/IcPartyMemberImportListener.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/handler/IcPartyMemberImportListener.java @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.List; /** - * 核酸检测excel导入监听器 + * 党员excel导入监听器 * @author Administrator */ @Data @@ -89,7 +89,7 @@ public class IcPartyMemberImportListener implements ReadListener { item.setIsLd(NumConstant.ONE_STR.equals(item.getIsLd()) ? "是" : "否"); - item.setIsLd(NumConstant.ONE_STR.equals(item.getIsPay()) ? "是" : "否"); + item.setIsPay(NumConstant.ONE_STR.equals(item.getIsPay()) ? "是" : "否"); item.setPartyZw(PartyPostEnum.getName(item.getPartyZw())); item.setCulture(education.getData().get(item.getCulture())); item.setPoint(("0.00").equals(item.getPoint()) ? StrConstant.HYPHEN : item.getPoint()); @@ -457,7 +457,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl