|
|
@@ -481,9 +481,12 @@ public class KwtWaybillManagementService {
|
|
|
if (statusVO.getCode().equals(kwtWaybillOrderTrack.getStatus())) {
|
|
|
statusVO.setStatus(true);
|
|
|
statusVO.setId(kwtWaybillOrderTrack.getId());
|
|
|
- statusVO.setCreateTime(DateUtil.getDateTime(kwtWaybillOrderTrack.getCreateTime()).substring(0, 15));
|
|
|
+// statusVO.setCreateTime(DateUtil.getDateTime(kwtWaybillOrderTrack.getCreateTime()).substring(0, 15));
|
|
|
+// statusVO.setOperateTime(kwtWaybillOrderTrack.getOperateTime() == null
|
|
|
+// ? null : DateUtil.getDateTime(kwtWaybillOrderTrack.getOperateTime()).substring(0, 15));
|
|
|
statusVO.setOperateTime(kwtWaybillOrderTrack.getOperateTime() == null
|
|
|
- ? null : DateUtil.getDateTime(kwtWaybillOrderTrack.getOperateTime()).substring(0, 15));
|
|
|
+ ? null : cn.hutool.core.date.DateUtil.format(kwtWaybillOrderTrack.getOperateTime(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ statusVO.setCreateTime(cn.hutool.core.date.DateUtil.format(kwtWaybillOrderTrack.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
statusVO.setCreateByName(usersMap.get(kwtWaybillOrderTrack.getCreateBy()) == null
|
|
|
? null : usersMap.get(kwtWaybillOrderTrack.getCreateBy()).getName());
|
|
|
break;
|