Merge remote-tracking branch 'origin/dev_tripreport' into dev_tripreport

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;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java

@@ -64,6 +64,7 @@ public class IcTripReportExcelImportListener implements ReadListener<IcTripRepor
             tripReportRecordEntity.setAgencyId(staffInfo.getAgencyId());
             tripReportRecordEntity.setPids(staffInfo.getAgencyPIds());
             tripReportRecordEntity.setUserType(IcResiUserConstant.USER_TYPE_IMPORT);
+            tripReportRecordEntity.setIsNatRecord("是".equals(data.getIsNatRecord()) ? "1" : "0");
             datas.add(tripReportRecordEntity);
 
             if (datas.size() == MAX_THRESHOLD) {