提交新增合同文件校验

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

@@ -3526,6 +3526,17 @@ public class KwtWaybillOrderV1Service {
 
         // 转换为VO对象
         WaybillOrderNodeVo waybillOrderNodeVo = new WaybillOrderNodeVo();
+        //获取时间线
+        List<WaybillOrderNodeVo.Timeline> voList = getTimelines(nodes);
+        waybillOrderNodeVo.setTimelines(voList);
+        // 获取时间节点
+        List<WaybillOrderNodeVo.WaybillOrderNode> nodeList = getWaybillOrderNodes(voList);
+        waybillOrderNodeVo.setWaybillOrderNodes(nodeList);
+        return waybillOrderNodeVo;
+    }
+
+    @NotNull
+    private List<WaybillOrderNodeVo.Timeline> getTimelines(List<KwtWaybillOrderNode> nodes) {
         List<WaybillOrderNodeVo.Timeline> voList = new ArrayList<>();
         for (KwtWaybillOrderNode node : nodes) {
             WaybillOrderNodeVo.Timeline vo = new WaybillOrderNodeVo.Timeline();
@@ -3552,7 +3563,11 @@ public class KwtWaybillOrderV1Service {
 
             voList.add(vo);
         }
-        waybillOrderNodeVo.setTimelines(voList);
+        return voList;
+    }
+
+    @NotNull
+    private static List<WaybillOrderNodeVo.WaybillOrderNode> getWaybillOrderNodes(List<WaybillOrderNodeVo.Timeline> voList) {
         Map<Integer, List<WaybillOrderNodeVo.Timeline>> statusAndTimelineMap = voList.stream()
                 .filter(t ->!Arrays.asList(CarWaybillV1Enum.WAIT_UNLOADING.getCode(),CarWaybillV1Enum.APPROVAL_TREAT.getCode(), CarWaybillV1Enum.COMPLETION_UNLOADING.getCode()).contains(t.getOrderStatus()))
                 .sorted(Comparator.comparing(WaybillOrderNodeVo.Timeline::getCreateTime))
@@ -3569,9 +3584,7 @@ public class KwtWaybillOrderV1Service {
                 nodeList.add(waybillOrderNode);
             }
         });
-
-        waybillOrderNodeVo.setWaybillOrderNodes(nodeList);
-        return waybillOrderNodeVo;
+        return nodeList;
     }
 
     /**