From d331c5475f0b07f36161a4464d92e32b6913b4e9 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 24 十一月 2023 14:50:43 +0800
Subject: [PATCH] 后台增加用户搜索列表
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 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 cb170d2..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,10 +1,10 @@
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 org.springframework.format.annotation.DateTimeFormat;
import java.net.URL;
import java.util.Date;
@@ -38,12 +38,15 @@
@ExcelProperty(value = "出发城市")
private String departureCity;
+ @ExcelProperty(value = "出发详细地址")
+ private String departureAddress;
+
/**
* 出发日期
*/
@ExcelProperty(value = "出发日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat("yyyy-MM-dd")
private Date departureDate;
/**
@@ -69,7 +72,7 @@
*/
@ExcelProperty(value = "到达日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat("yyyy-MM-dd")
private Date arriveDate;
/**
@@ -108,15 +111,30 @@
@ExcelProperty(value = "48小时内核酸检测")
private String acidTest;
- @ExcelProperty("健康码截图")
- private URL colorImage;
+// @ExcelProperty("健康码截图")
+// private URL colorImage;
+//
+// @ExcelProperty("行程码截图")
+// private URL travelImage;
+//
+// @ExcelProperty("48小时核酸截图")
+// private URL acidImage;
- @ExcelProperty("行程码截图")
- private URL travelImage;
+// @ExcelProperty("疫苗接种截图")
+// private URL vaccinationImage;
- @ExcelProperty("48小时核酸截图")
- private URL acidImage;
+ @ExcelProperty("交通工具")
+ private String transport;
- @ExcelProperty("疫苗接种截图")
- private URL vaccinationImage;
+ @ExcelProperty("车次信息")
+ private String transportInfo;
+
+ @ExcelProperty("是否核对")
+ private String checkStatus;
+
+ @ExcelProperty("是否冷链、运输、海口等特殊行业从业者")
+ private String isSpecialJob;
+
+ @ExcelProperty("是否为入（返）川学生")
+ private String isStudent;
}
--
Gitblit v1.7.1