From 1ec76759f922abc91b1c4621444d8f8c764af3c9 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 14 Oct 2021 10:11:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/modules/epidemic/entity/TripReportEntity.java   | 2 +-
 .../esua/epdc/modules/epidemic/excel/TripReportExcel.java     | 2 +-
 .../modules/epidemic/service/impl/TripReportServiceImpl.java  | 4 ++++
 .../src/main/resources/mapper/epidemic/TripReportDao.xml      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TripReportEntity.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TripReportEntity.java
index 5ac7eec..02ea78e 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TripReportEntity.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TripReportEntity.java
@@ -66,7 +66,7 @@ public class TripReportEntity extends BaseEpdcEntity {
     /**
      * 现居住详细地址
      */
-	private String nowAddressDaetail;
+	private String nowAddressDetail;
 
     /**
      * 来自地区编码
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java
index 0f24459..9ffa418 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java
@@ -50,7 +50,7 @@ public class TripReportExcel {
     private String nowAddressName;
 
     @Excel(name = "现居住详细地址")
-    private String nowAddressDaetail;
+    private String nowAddressDetail;
 
     @Excel(name = "来自地区编码")
     private String comeAddressCode;
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java
index ba57674..4d84a13 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java
@@ -110,6 +110,7 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
 
     @Override
     public Result saveTripInfo(SaveTripInfoFormDTO formDto) {
+        log.info("formDto:"+formDto);
         TripReportEntity entity = ConvertUtils.sourceToTarget(formDto, TripReportEntity.class);
         insert(entity);
         return new Result().ok("操作成功！");
@@ -117,6 +118,7 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
 
     @Override
     public Result getTripInfoList(GetTripInfoFormDTO formDto) {
+        log.info("formDto:"+formDto);
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
         formDto.setPageIndex(pageIndex);
         List<TripListDTO> result = baseDao.getTripInfoList(formDto);
@@ -125,12 +127,14 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
 
     @Override
     public Result getTripInfoDetail(GetTripInfoFormDTO formDto) {
+        log.info("formDto:"+formDto);
         TripReportEntity entity = selectById(formDto.getId());
         return new Result().ok(entity);
     }
 
     @Override
     public Result deleteTripById(GetTripInfoFormDTO formDto) {
+        log.info("formDto:"+formDto);
         Boolean result = deleteById(formDto.getId());
         if(result){
             return new Result().ok("操作成功！");
diff --git a/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml b/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml
index d127f58..509fcd1 100644
--- a/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml
+++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml
@@ -10,7 +10,7 @@
         <result property="idCard" column="ID_CARD"/>
         <result property="nowAddressCode" column="NOW_ADDRESS_CODE"/>
         <result property="nowAddressName" column="NOW_ADDRESS_NAME"/>
-        <result property="nowAddressDaetail" column="NOW_ADDRESS_DAETAIL"/>
+        <result property="nowAddressDetail" column="NOW_ADDRESS_DETAIL"/>
         <result property="comeAddressCode" column="COME_ADDRESS_CODE"/>
         <result property="comeAddressName" column="COME_ADDRESS_NAME"/>
         <result property="comeDate" column="COME_DATE"/>