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 scopeV2DTOS = serviceScopeDao.selectListV2(formDTO.getServiceRecordId()); result.setGridIdList(scopeV2DTOS);