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