Commit 93d238363a7f74e0dcd4a6fa4079c0951d79496a
1 parent
e37f336e8d
Exists in
master
and in
6 other branches
追访相关
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
View file @
93d2383
... | ... | @@ -346,9 +346,9 @@ |
346 | 346 | Map<String, Object> temp = new HashMap<>(); |
347 | 347 | temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd_hms(trackDown.getTrackDownDate())); |
348 | 348 | temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId()); |
349 | - temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownDateType())); | |
349 | + temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType())); | |
350 | 350 | temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); |
351 | - temp.put("reservatDate", DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); | |
351 | + temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" :DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); | |
352 | 352 | tabList.add(temp); |
353 | 353 | } |
354 | 354 | return RespBuilder.buildSuccess(tabList); |