diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java index f6f2a86e42..af4c6aae75 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java @@ -31,18 +31,37 @@ public class IcTripReportExcelData { @ExcelProperty("现居地(格式:省-市-区-街道-社区)") private String presentAddress; - @NotBlank(message = "详细地址为必填项") - @ExcelProperty("详细地址") + @NotBlank(message = "现居地详细地址为必填项") + @ExcelProperty("现居地详细地址") private String detailAddress; @NotBlank(message = "来自地区为必填项") @ExcelProperty("来自地区(格式:省-市-区-街道-社区)") private String sourceAddress; + @NotBlank(message = "来自地区详细地址为必填项") + @ExcelProperty("来自地区详细地址") + private String sourceDetailAddress; + @NotNull(message = "来到本地时间为必填项") @ExcelProperty("来到本地时间(格式:2022-01-01)") private Date arriveDate; + @ExcelProperty("返回方式") + @NotBlank(message = "不能为空") + private String trafficType; + + @ExcelProperty("其他返回方式") + private String trafficTypeExplain; + + @NotBlank(message = "48小时核酸检测为必填项") + @ExcelProperty("48小时核酸检测") + private String isNatRecord; + + @NotBlank(message = "疫苗接种针次为必填项") + @ExcelProperty("疫苗接种针次") + private String vaccineNum; + @ExcelProperty("离开本地时间(格式:2022-01-01)") private Date leaveDate; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java index 2831eb532c..a9e1a102d7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java @@ -64,6 +64,7 @@ public class IcTripReportExcelImportListener implements ReadListener