时间格式化

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillManagementV1Service.java

@@ -381,7 +381,7 @@ public class KwtWaybillManagementV1Service {
                 trackData.put("operateByName", track != null ? usersMap.get(track.getCreateBy()) == null ? waybillOrder.getDriverName() : usersMap.get(track.getCreateBy()).getName() : 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);
@@ -402,7 +402,7 @@ public class KwtWaybillManagementV1Service {
         trackData.put("operateByName", usersMap.get(waybillOrder.getCreateBy()) != null ? usersMap.get(waybillOrder.getCreateBy()).getName() : waybillOrder.getDriverName());
         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", CarWaybillDetailEnum.WAIT_APPROVAL.getCode());
         trackData.put("statusName", CarWaybillDetailEnum.WAIT_APPROVAL.getName());
         trackList.add(trackData);
@@ -440,7 +440,7 @@ public class KwtWaybillManagementV1Service {
         result.put("driverName", waybillOrder.getDriverName());
         result.put("driverPhone", waybillOrder.getDriverPhone());
         result.put("driverIdcard", waybillOrder.getDriverIdcard());
-        result.put("createTime", waybillOrder.getCreateTime());
+        result.put("createTime", DateUtils.format(waybillOrder.getCreateTime(), DateUtils.DATE_TIME_PATTERN));
         result.put("checkFirmName", checkFirmName);
         result.put("carrierFirmName", carrierFirmName);
         result.put("trackList", trackList);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -317,8 +317,8 @@ public class KwtWaybillOrderV1Service {
             trackData.put("status", track.getStatus());
             trackData.put("statusName", CarWaybillEnum.getAlias(track.getStatus()));
             trackData.put("remark", track.getRemark());
-            trackData.put("operateTime", track.getOperateTime());
-            trackData.put("createTime", track.getCreateTime());
+            trackData.put("operateTime", DateUtils.format(track.getOperateTime(), DateUtils.DATE_TIME_PATTERN));
+            trackData.put("createTime", DateUtils.format(track.getCreateTime(), DateUtils.DATE_TIME_PATTERN));
             trackData.put("createByName", usersMap.get(waybillOrder.getCreateBy()) != null ? usersMap.get(waybillOrder.getCreateBy()).getName() : null);
             trackData.put("createByPhone", usersMap.get(waybillOrder.getCreateBy()) != null ? usersMap.get(waybillOrder.getCreateBy()).getPhone() : null);
             trackList.add(trackData);