|
|
@@ -638,7 +638,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
Map<String, Object> trackData = new HashMap<>(NumberConstant.SIXTEEN);
|
|
|
trackData.put("operateTime", track != null ? DateUtils.format(track.getOperateTime(), DateUtils.FORMAT11) : null);
|
|
|
trackData.put("operateStatus", track != null);
|
|
|
- trackData.put("createTime", track != null ? track.getCreateTime() : null);
|
|
|
+ trackData.put("createTime", track != null ? DateUtils.format(track.getCreateTime(), DateUtils.DATE_TIME_PATTERN) : null);
|
|
|
trackData.put("status", status);
|
|
|
trackData.put("statusName", CarWaybillDetailEnum.getName1(Integer.valueOf(status)));
|
|
|
trackList.add(trackData);
|
|
|
@@ -669,10 +669,10 @@ public class KwtWaybillOrderV1Service {
|
|
|
trackData.put("id", track != null ? track.getId() : null);
|
|
|
trackData.put("operateTime", track != null ? DateUtils.format(track.getOperateTime(), DateUtils.FORMAT11) : null);
|
|
|
trackData.put("operateStatus", track != null);
|
|
|
- trackData.put("createTime", track != null ? track.getCreateTime() : null);
|
|
|
+ trackData.put("createTime", track != null ? DateUtils.format(track.getCreateTime(), DateUtils.DATE_TIME_PATTERN) : null);
|
|
|
trackData.put("status", status);
|
|
|
trackData.put("statusName", CarWaybillEnum.getName(status));
|
|
|
- trackData.put("planTime", track != null ? address.getPlanTime() : null);
|
|
|
+ trackData.put("planTime", track != null ? DateUtils.format(address.getPlanTime(), DateUtils.DATE_TIME_PATTERN) : null);
|
|
|
trackData.put("addressName", address.getName());
|
|
|
trackData.put("addressCityName", address.getCityName());
|
|
|
trackData.put("addressDetail", address.getDetailAddress());
|