From 77872e57f04729755813ef8336aae0031505d896 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 25 Aug 2022 14:48:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92=E7=96=AB?= =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcVaccinePrarmeterDTO.java | 6 +++--- .../com/epmet/entity/IcVaccinePrarmeterEntity.java | 6 +++--- .../com/epmet/excel/IcVaccinePrarmeterExcel.java | 10 +++++----- .../epmet/excel/IcVaccinePrarmeterImportExcel.java | 6 +++--- .../error/IcVaccinePrarmeterImportErrorModel.java | 12 ++++++------ .../service/impl/IcVaccinePrarmeterServiceImpl.java | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java index 55991fe87d..a7d56eeec7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java @@ -116,7 +116,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第一次接种时间 */ - private Date firstVacTime; + private String firstVacTime; /** * 第一次接种地点 @@ -126,7 +126,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第二次接种时间 */ - private Date secondVacTime; + private String secondVacTime; /** * 第二次接种地点 @@ -136,7 +136,7 @@ public class IcVaccinePrarmeterDTO implements Serializable { /** * 第三次接种时间 */ - private Date thirdVacTime; + private String thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java index e0331229c4..c6b982f80d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java @@ -114,7 +114,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第一次接种时间 */ - private Date firstVacTime; + private String firstVacTime; /** * 第一次接种地点 @@ -124,7 +124,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第二次接种时间 */ - private Date secondVacTime; + private String secondVacTime; /** * 第二次接种地点 @@ -134,7 +134,7 @@ public class IcVaccinePrarmeterEntity extends BaseEpmetEntity { /** * 第三次接种时间 */ - private Date thirdVacTime; + private String thirdVacTime; /** * 第三次接种地点 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java index bb6b9c5d15..fd95325e80 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java @@ -50,20 +50,20 @@ public class IcVaccinePrarmeterExcel { @Excel(name = "是否接种", replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "第一次接种时间") private Date firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; - @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + @Excel(name = "第二次接种时间") + private String secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; - @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + @Excel(name = "第三次接种时间") + private String thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java index daecc97e0e..893531a4d2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterImportExcel.java @@ -46,19 +46,19 @@ public class IcVaccinePrarmeterImportExcel { private String isVaccination; @Excel(name = "第一次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date firstVacTime; + private String firstVacTime; @Excel(name = "第一次接种地点") private String firstVacSite; @Excel(name = "第二次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + private String secondVacTime; @Excel(name = "第二次接种地点") private String secondVacSite; @Excel(name = "第三次接种时间", format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + private String thirdVacTime; @Excel(name = "第三次接种地点") private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java index 04768bb90e..7d34af62aa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/error/IcVaccinePrarmeterImportErrorModel.java @@ -47,20 +47,20 @@ public class IcVaccinePrarmeterImportErrorModel { @Excel(name = "是否接种", width = 30, replace = {"否_0","是_1"}) private String isVaccination; - @Excel(name = "第一次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date firstVacTime; + @Excel(name = "第一次接种时间",width = 30) + private String firstVacTime; @Excel(name = "第一次接种地点",width = 30) private String firstVacSite; - @Excel(name = "第二次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date secondVacTime; + @Excel(name = "第二次接种时间",width = 30) + private String secondVacTime; @Excel(name = "第二次接种地点",width = 30) private String secondVacSite; - @Excel(name = "第三次接种时间",width = 30, format = "yyyy-MM-dd HH:mm:ss") - private Date thirdVacTime; + @Excel(name = "第三次接种时间",width = 30) + private String thirdVacTime; @Excel(name = "第三次接种地点",width = 30) private String thirdVacSite; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 28b8c65906..83cb4a4f29 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -294,7 +294,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl