已完成运单按照时间倒序排列

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderStatusResp.java

@@ -1,12 +1,13 @@
 package com.sckw.transport.model.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author :chenXiaoFei
@@ -223,6 +224,12 @@ public class WaybillOrderStatusResp implements Serializable {
     @Schema(description = "订单类型（1-原矿转运）")
     private Integer orderType;
 
+    /**
+     * 更新时间
+     */
+    @Schema(description = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
 
     /**
      * 标签

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -673,6 +673,7 @@ public class WaybillOrderService {
 
         //获取运单关联数据并返回结果
         List<WaybillOrderStatusResp> ordderList = getWaybillOrderRelevantData(param, records);
+        sort(param, ordderList);
         log.info("查询司机的物流运单成功！");
         return PageDataResult.success(param.getPageNum(), param.getPageSize(), waybillOrderList.getTotal() , ordderList);
     }
@@ -1085,6 +1086,7 @@ public class WaybillOrderService {
         wbOrderResp.setWaybillNo(wbOrder.getWOrderNo());
         wbOrderResp.setRemark(wbOrder.getRemark());
         wbOrderResp.setLabel(wbOrder.getLabel());
+        wbOrderResp.setUpdateTime(wbOrder.getUpdateTime());
         //装货、卸货净重、任务量
         KwtWaybillOrderSubtask subtask = subtaskMap.getOrDefault(wbOrder.getId(), new KwtWaybillOrderSubtask());
         wbOrderResp.setLoadingNetWeight(subtask.getLoadAmount());
@@ -1358,6 +1360,22 @@ public class WaybillOrderService {
                 .collect(Collectors.groupingBy(KwtWaybillOrderTicket::getWOrderId));
     }
 
+    /**
+     * 排序
+     * @param param
+     * @param gatekeeperOrderPageResult
+     */
+    private void sort(WaybillOrderQueryParam param, List<WaybillOrderStatusResp> ordderList) {
+        log.info("运单分页列表排序，param:{}, order:{}", JSON.toJSONString(param), JSON.toJSONString(ordderList));
+        if (CollectionUtils.isEmpty(ordderList)) {
+            return;
+        }
+        // 完成运单，根据时间倒叙排列
+        if (Objects.equals(3, param.getStatus())) {
+            ordderList.sort(Comparator.comparing(WaybillOrderStatusResp::getUpdateTime).reversed());
+        }
+    }
+
     /**
      * 运单统计
      * @param param