From 304a7389ee81531e8a003e92513e6cd98a64f068 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 25 Nov 2022 10:12:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E9=97=B4=E9=94=99?=
 =?UTF-8?q?=E4=B9=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/IcTripReportRecordDTO.java    | 2 +-
 .../com/epmet/excel/IcYtTripReportRecordExportExcel.java  | 8 +++++---
 .../src/main/resources/mapper/IcTripReportRecordDao.xml   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
index 21c6642b16..0a236903bf 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
@@ -542,7 +542,7 @@ public class IcTripReportRecordDTO implements Serializable {
      */
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date leaveTheRiskAreaTime;
+    private String leaveTheRiskAreaTime;
     /**
      * 是否携带48小时核算证明  是/否【烟台】
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcYtTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcYtTripReportRecordExportExcel.java
index 9ed7ee958c..5cd24b489d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcYtTripReportRecordExportExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcYtTripReportRecordExportExcel.java
@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.write.style.HeadStyle;
 import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 
@@ -54,19 +55,20 @@ public class IcYtTripReportRecordExportExcel implements Serializable {
      */
     @ColumnWidth(30)
     @ExcelProperty(value = "来自地区")
-    private String comeAreaFull;
+    private String sourceAddress;
     /**
      * 来自地区详细地址
      */
     @ColumnWidth(30)
     @ExcelProperty(value = "来自地区详细地址")
-    private String sourceDetailAddress;
+    private String comeAreaFull;
     /**
      * 来到本地时间
      */
     @ColumnWidth(20)
     @ExcelProperty(value = "来到本地时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private String arriveTime;
 
     /**
@@ -184,7 +186,7 @@ public class IcYtTripReportRecordExportExcel implements Serializable {
     @ColumnWidth(20)
     @ExcelProperty(value = "离开本地时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private String leaveDate;
+    private String leaveTheRiskAreaTime;
     /**
      * 备注
      */
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
index e4bf6c5465..f43978329f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
@@ -44,7 +44,7 @@
         ELSE IFNULL(cs.REAL_NAME, '无')
         END
         ) AS createdByName,
-        CONCAT(r.via_province,r.via_city,r.via_city) via
+        CONCAT(r.via_province,r.via_city,r.via_county) via
         FROM ic_trip_report_record r
         LEFT JOIN (
                 select * from ic_epidemic_special_attention GROUP BY id_card  ORDER BY created_time DESC