新冠病毒疫苗接种人员信息台账

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;
 
     /**
      * 第三次接种地点

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;
 
     /**
      * 第三次接种地点

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;

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;

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;

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java

@@ -294,7 +294,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
 
             }else{
                 // 已接种 判断是否填写接种时间地点
-                if (list.get(i).getFirstVacTime() == null && !list.get(i).getAddStatus()){
+                if (StringUtils.isBlank(list.get(i).getFirstVacTime()) && !list.get(i).getAddStatus()){
                     errorInfo.add(getErrorInfo(list.get(i), "第一次接种时间不能为空",i+1));
                     list.get(i).setAddStatus(true);
                     continue;
@@ -304,7 +304,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
                     list.get(i).setAddStatus(true);
                     continue;
                 }
-                if (list.get(i).getSecondVacTime() == null && !list.get(i).getAddStatus()){
+                if (StringUtils.isBlank(list.get(i).getSecondVacTime()) && !list.get(i).getAddStatus()){
                     errorInfo.add(getErrorInfo(list.get(i), "第二次接种时间不能为空",i+1));
                     list.get(i).setAddStatus(true);
                     continue;
@@ -314,7 +314,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
                     list.get(i).setAddStatus(true);
                     continue;
                 }
-                if (list.get(i).getThirdVacTime() == null && !list.get(i).getAddStatus()){
+                if (StringUtils.isBlank(list.get(i).getThirdVacTime()) && !list.get(i).getAddStatus()){
                     errorInfo.add(getErrorInfo(list.get(i), "第三次接种时间不能为空",i+1));
                     list.get(i).setAddStatus(true);
                     continue;