From 6d18eb4e9f5e158d79551469ccf8a81205769047 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 9 Nov 2021 15:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=9F=BA=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=BD=AC=E4=B8=BAstr=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcEnsureHouseDTO.java | 2 +- .../src/main/java/com/epmet/dto/IcPartyMemberDTO.java | 7 ++++--- .../src/main/java/com/epmet/dto/IcResiUserDTO.java | 8 ++++---- .../src/main/java/com/epmet/dto/IcUnemployedDTO.java | 2 +- .../src/main/java/com/epmet/dto/IcVeteransDTO.java | 9 +++++---- .../java/com/epmet/entity/IcEnsureHouseEntity.java | 5 +---- .../java/com/epmet/entity/IcPartyMemberEntity.java | 7 ++----- .../main/java/com/epmet/entity/IcResiUserEntity.java | 11 ++++------- .../java/com/epmet/entity/IcUnemployedEntity.java | 2 +- .../main/java/com/epmet/entity/IcVeteransEntity.java | 9 +++------ .../main/java/com/epmet/excel/IcEnsureHouseExcel.java | 2 +- .../main/java/com/epmet/excel/IcPartyMemberExcel.java | 4 ++-- .../main/java/com/epmet/excel/IcResiUserExcel.java | 8 ++++---- .../main/java/com/epmet/excel/IcUnemployedExcel.java | 2 +- .../main/java/com/epmet/excel/IcVeteransExcel.java | 6 +++--- 15 files changed, 37 insertions(+), 47 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java index 0868f00f51..1f53e4206a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java @@ -61,7 +61,7 @@ public class IcEnsureHouseDTO implements Serializable { /** * 发证日期 */ - private Date fzrq; + private String fzrq; /** * 补贴编号 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPartyMemberDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPartyMemberDTO.java index 7dd3198144..c5df27c097 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPartyMemberDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPartyMemberDTO.java @@ -17,9 +17,10 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -51,12 +52,12 @@ public class IcPartyMemberDTO implements Serializable { /** * 入党时间 */ - private Date rdsj; + private String rdsj; /** * 转正时间 */ - private Date zzsj; + private String zzsj; /** * 所属支部 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index 12990d491f..62fa0e45cf 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -301,7 +301,7 @@ public class IcResiUserDTO implements Serializable { /** * 患大病时间 */ - private Date dbsj; + private String dbsj; /** * 所患慢性病 @@ -311,7 +311,7 @@ public class IcResiUserDTO implements Serializable { /** * 患慢性病时间 */ - private Date mxbsj; + private String mxbsj; /** * 是否参保 @@ -331,7 +331,7 @@ public class IcResiUserDTO implements Serializable { /** * 救助时间[yyyy-MM-dd] */ - private Date jzsj; + private String jzsj; /** * 享受救助明细序号 @@ -356,7 +356,7 @@ public class IcResiUserDTO implements Serializable { /** * 离退休时间 */ - private Date ltxsj; + private String ltxsj; /** * 工作信息备注 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java index 930d40c706..85a3e63feb 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java @@ -61,7 +61,7 @@ public class IcUnemployedDTO implements Serializable { /** * 失业时间 */ - private Date sysj; + private String sysj; /** * 失业证号 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java index 9a0c6399aa..351b60a933 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java @@ -17,9 +17,10 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -51,12 +52,12 @@ public class IcVeteransDTO implements Serializable { /** * 入伍时间 */ - private Date rwsj; + private String rwsj; /** * 退伍时间 */ - private Date twsj; + private String twsj; /** * 服役单位 @@ -81,7 +82,7 @@ public class IcVeteransDTO implements Serializable { /** * 参战时间【年月日区间值yyyy-MM-dd~yyyy-MM-dd】 */ - private Date czsj; + private String czsj; /** * 现就业情况 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEnsureHouseEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEnsureHouseEntity.java index 917382ceb9..be467bddb5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEnsureHouseEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEnsureHouseEntity.java @@ -18,13 +18,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 保障房 * @@ -61,7 +58,7 @@ public class IcEnsureHouseEntity extends BaseEpmetEntity { /** * 发证日期 */ - private Date fzrq; + private String fzrq; /** * 补贴编号 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java index 90b543dd6e..10add799d0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java @@ -18,13 +18,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 党员 * @@ -51,12 +48,12 @@ public class IcPartyMemberEntity extends BaseEpmetEntity { /** * 入党时间 */ - private Date rdsj; + private String rdsj; /** * 转正时间 */ - private Date zzsj; + private String zzsj; /** * 所属支部 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index 6f9f7d4068..f647871525 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -18,13 +18,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 用户基础信息 * @@ -301,7 +298,7 @@ public class IcResiUserEntity extends BaseEpmetEntity { /** * 患大病时间 */ - private Date dbsj; + private String dbsj; /** * 所患慢性病 @@ -311,7 +308,7 @@ public class IcResiUserEntity extends BaseEpmetEntity { /** * 患慢性病时间 */ - private Date mxbsj; + private String mxbsj; /** * 是否参保 @@ -331,7 +328,7 @@ public class IcResiUserEntity extends BaseEpmetEntity { /** * 救助时间[yyyy-MM-dd] */ - private Date jzsj; + private String jzsj; /** * 享受救助明细序号 @@ -356,7 +353,7 @@ public class IcResiUserEntity extends BaseEpmetEntity { /** * 离退休时间 */ - private Date ltxsj; + private String ltxsj; /** * 工作信息备注 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java index c81f359e09..9e00e6527f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java @@ -61,7 +61,7 @@ public class IcUnemployedEntity extends BaseEpmetEntity { /** * 失业时间 */ - private Date sysj; + private String sysj; /** * 失业证号 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java index 68720a6be5..076d6f33fe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java @@ -18,13 +18,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 退役军人 * @@ -51,12 +48,12 @@ public class IcVeteransEntity extends BaseEpmetEntity { /** * 入伍时间 */ - private Date rwsj; + private String rwsj; /** * 退伍时间 */ - private Date twsj; + private String twsj; /** * 服役单位 @@ -81,7 +78,7 @@ public class IcVeteransEntity extends BaseEpmetEntity { /** * 参战时间【年月日区间值yyyy-MM-dd~yyyy-MM-dd】 */ - private Date czsj; + private String czsj; /** * 现就业情况 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcEnsureHouseExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcEnsureHouseExcel.java index ea5f69f3d3..dd7995d714 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcEnsureHouseExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcEnsureHouseExcel.java @@ -47,7 +47,7 @@ public class IcEnsureHouseExcel { private String bzlx; @Excel(name = "发证日期") - private Date fzrq; + private String fzrq; @Excel(name = "补贴编号") private String btbh; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPartyMemberExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPartyMemberExcel.java index 71e3ed92a9..5374d00284 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPartyMemberExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPartyMemberExcel.java @@ -41,10 +41,10 @@ public class IcPartyMemberExcel { private String icResiUser; @Excel(name = "入党时间") - private Date rdsj; + private String rdsj; @Excel(name = "转正时间") - private Date zzsj; + private String zzsj; @Excel(name = "所属支部") private String sszb; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserExcel.java index a3abac4d57..217223a4bb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserExcel.java @@ -188,13 +188,13 @@ public class IcResiUserExcel { private String shdb; @Excel(name = "患大病时间") - private Date dbsj; + private String dbsj; @Excel(name = "所患慢性病") private String shmxb; @Excel(name = "患慢性病时间") - private Date mxbsj; + private String mxbsj; @Excel(name = "是否参保") private String isCb; @@ -206,7 +206,7 @@ public class IcResiUserExcel { private String jzje; @Excel(name = "救助时间[yyyy-MM-dd]") - private Date jzsj; + private String jzsj; @Excel(name = "享受救助明细序号") private String jzmxxh; @@ -221,7 +221,7 @@ public class IcResiUserExcel { private String zy; @Excel(name = "离退休时间") - private Date ltxsj; + private String ltxsj; @Excel(name = "工作信息备注") private String workRemake; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnemployedExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnemployedExcel.java index 9c1b4d7e00..91556105d9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnemployedExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnemployedExcel.java @@ -47,7 +47,7 @@ public class IcUnemployedExcel { private String syrylb; @Excel(name = "失业时间") - private Date sysj; + private String sysj; @Excel(name = "失业证号") private String syzh; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java index 8a290d5b3e..3109a7fa4d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java @@ -41,10 +41,10 @@ public class IcVeteransExcel { private String icResiUser; @Excel(name = "入伍时间") - private Date rwsj; + private String rwsj; @Excel(name = "退伍时间") - private Date twsj; + private String twsj; @Excel(name = "服役单位") private String fydw; @@ -59,7 +59,7 @@ public class IcVeteransExcel { private String pxzk; @Excel(name = "参战时间【年月日区间值yyyy-MM-dd~yyyy-MM-dd】") - private Date czsj; + private String czsj; @Excel(name = "现就业情况") private String xjyqk;