From 93d238363a7f74e0dcd4a6fa4079c0951d79496a Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Thu, 11 Jan 2018 16:41:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index fee8eb3..22f646b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -346,9 +346,9 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS Map temp = new HashMap<>(); temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd_hms(trackDown.getTrackDownDate())); temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId()); - temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownDateType())); + temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType())); temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); - temp.put("reservatDate", DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); + temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" :DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); tabList.add(temp); } return RespBuilder.buildSuccess(tabList); -- 1.8.3.1