From bd9f12cd35778eb4a75590f646f1aae3a52ceff2 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 19 Jul 2022 17:40:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java  | 4 ++--
 .../com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java  | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java
index 7043ddfc0a..536e292c70 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java
@@ -48,12 +48,12 @@ public class ServiceRecordV2DetailResultDTO implements Serializable {
     /**
      * 服务时间
      */
-    private Date serviceTimeStart;
+    private String serviceTimeStart;
 
     /**
      * 服务截止时间
      */
-    private Date serviceTimeEnd;
+    private String serviceTimeEnd;
 
     /**
      * in_service服务中；completed:已完成；cancel：取消
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java
index f817137bde..bf5997a1b8 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java
@@ -12,6 +12,7 @@ import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dao.IcServiceFeedbackV2Dao;
 import com.epmet.dao.IcServiceRecordV2Dao;
 import com.epmet.dao.IcServiceScopeDao;
@@ -224,6 +225,8 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
             return new ServiceRecordV2DetailResultDTO();
         }
         ServiceRecordV2DetailResultDTO result = ConvertUtils.sourceToTarget(entity, ServiceRecordV2DetailResultDTO.class);
+        result.setServiceTimeStart(DateUtils.format(entity.getServiceTimeStart(),DateUtils.DATE_PATTERN));
+        result.setServiceTimeEnd(DateUtils.format(entity.getServiceTimeEnd(),DateUtils.DATE_PATTERN));
         result.setServiceRecordId(entity.getId());
         List<IcServiceScopeV2DTO> scopeV2DTOS = serviceScopeDao.selectListV2(formDTO.getServiceRecordId());
         result.setGridIdList(scopeV2DTOS);