From 10df7e29b51d6a2efacc83d870856f57d97a9b66 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 13:48:24 +0800
Subject: [PATCH] #feat 修改别名

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
index c6c602a..051ab79 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
@@ -1,9 +1,12 @@
 package com.panzhihua.common.model.vos.community.acid;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.net.URL;
 import java.util.Date;
 
 /**
@@ -35,10 +38,7 @@
     @ExcelProperty(value = "出发城市")
     private String departureCity;
 
-    /**
-     * 出发地址
-     */
-    @ExcelProperty(value = "详细地址")
+    @ExcelProperty(value = "出发详细地址")
     private String departureAddress;
 
     /**
@@ -46,6 +46,7 @@
      */
     @ExcelProperty(value = "出发日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat("yyyy-MM-dd")
     private Date departureDate;
 
     /**
@@ -71,6 +72,7 @@
      */
     @ExcelProperty(value = "到达日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat("yyyy-MM-dd")
     private Date arriveDate;
 
     /**
@@ -108,4 +110,31 @@
      */
     @ExcelProperty(value = "48小时内核酸检测")
     private String acidTest;
+
+//    @ExcelProperty("健康码截图")
+//    private URL colorImage;
+//
+//    @ExcelProperty("行程码截图")
+//    private URL travelImage;
+//
+//    @ExcelProperty("48小时核酸截图")
+//    private URL acidImage;
+
+//    @ExcelProperty("疫苗接种截图")
+//    private URL vaccinationImage;
+
+    @ExcelProperty("交通工具")
+    private String transport;
+
+    @ExcelProperty("车次信息")
+    private String transportInfo;
+
+    @ExcelProperty("是否核对")
+    private String checkStatus;
+
+    @ExcelProperty("是否冷链、运输、海口等特殊行业从业者")
+    private String isSpecialJob;
+
+    @ExcelProperty("是否为入(返)川学生")
+    private String isStudent;
 }

--
Gitblit v1.7.1