|
@@ -2225,7 +2225,7 @@ public class KwtWaybillOrderService {
|
|
|
result.put("unloadUrls", unloadTicket != null ? FileUtils.spliceBatch(unloadTicket.getUrls()) : null);
|
|
result.put("unloadUrls", unloadTicket != null ? FileUtils.spliceBatch(unloadTicket.getUrls()) : null);
|
|
|
result.put("unloadOperateTime", unloadTicket != null ? DateUtil.dateTimeFormatter(unloadTicket.getOperateTime()) : null);
|
|
result.put("unloadOperateTime", unloadTicket != null ? DateUtil.dateTimeFormatter(unloadTicket.getOperateTime()) : null);
|
|
|
result.put("unloadCreateTime", unloadTicket != null ? DateUtil.dateTimeFormatter(unloadTicket.getCreateTime()) : null);
|
|
result.put("unloadCreateTime", unloadTicket != null ? DateUtil.dateTimeFormatter(unloadTicket.getCreateTime()) : null);
|
|
|
- result.put("unloadCreateByName", usersMap.get(unloadTicket.getUpdateBy()));
|
|
|
|
|
|
|
+ result.put("unloadCreateByName", unloadTicket != null ? usersMap.get(unloadTicket.getUpdateBy()) : null);
|
|
|
result.put("unloadCityName", unloadAddress != null ? unloadAddress.getCityName() : null);
|
|
result.put("unloadCityName", unloadAddress != null ? unloadAddress.getCityName() : null);
|
|
|
result.put("unloadDetailAddress", unloadAddress != null ? unloadAddress.getDetailAddress() : null);
|
|
result.put("unloadDetailAddress", unloadAddress != null ? unloadAddress.getDetailAddress() : null);
|
|
|
result.put("approvalTime", track != null ? DateUtils.formatV1(track.getCreateTime()) : null);
|
|
result.put("approvalTime", track != null ? DateUtils.formatV1(track.getCreateTime()) : null);
|