停止接单数据转换

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/DriverListVo.java

@@ -36,7 +36,12 @@ public class DriverListVo {
     /**
      * 运力状态（0空闲/1任务中）
      */
-    private String transportStatus;
+    private Integer transportStatus;
+
+    /**
+     * 运力状态（0空闲/1任务中）
+     */
+    private String transportStatusLabel;
 
     /**
      * 运输次数

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

@@ -999,8 +999,10 @@ public class AcceptCarriageOrderService {
             for (DriverListVo driverListVo : list) {
                 if (!ObjectUtils.isEmpty(truck)) {
                     if (truck.get(driverListVo.getTruckNo()) != null) {
-                        Integer businessStatus = truck.get(driverListVo.getTruckNo()).getBusinessStatus();
-                        driverListVo.setTransportStatus((businessStatus == 0) ? "空闲" : "任务中");
+                        driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
+                    }
+                    if (driverListVo.getTransportStatus() != null) {
+                        driverListVo.setTransportStatusLabel((driverListVo.getTransportStatus() == 0) ? "空闲" : "任务中");
                     }
                     driverListVo.setCarType(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getTruckType());
                 }
@@ -1018,8 +1020,10 @@ public class AcceptCarriageOrderService {
                 if (!ObjectUtils.isEmpty(truck)) {
 //                    driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
                     if (truck.get(driverListVo.getTruckNo()) != null) {
-                        Integer businessStatus = truck.get(driverListVo.getTruckNo()).getBusinessStatus();
-                        driverListVo.setTransportStatus((businessStatus == 0) ? "空闲" : "任务中");
+                        driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
+                    }
+                    if (driverListVo.getTransportStatus() != null) {
+                        driverListVo.setTransportStatusLabel((driverListVo.getTransportStatus() == 0) ? "空闲" : "任务中");
                     }
                     driverListVo.setCarType(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getTruckType());
                 }

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

@@ -488,7 +488,13 @@ public class ConsignOrderService {
                 List<String> objects = new ArrayList<>();
                 objects.add(driverListVo.getTruckNo());
                 if (!ObjectUtils.isEmpty(truck)) {
-                    driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
+//                    driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
+                    if (truck.get(driverListVo.getTruckNo()) != null) {
+                        driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
+                    }
+                    if (driverListVo.getTransportStatus() != null) {
+                        driverListVo.setTransportStatusLabel((driverListVo.getTransportStatus() == 0) ? "空闲" : "任务中");
+                    }
                     driverListVo.setCarType(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getTruckType());
                 }
             }
@@ -526,7 +532,13 @@ public class ConsignOrderService {
             List<String> objects = new ArrayList<>();
             objects.add(driverListVo.getTruckNo());
             if (!ObjectUtils.isEmpty(truck)) {
-                driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
+//                driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
+                if (truck.get(driverListVo.getTruckNo()) != null) {
+                    driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
+                }
+                if (driverListVo.getTransportStatus() != null) {
+                    driverListVo.setTransportStatusLabel((driverListVo.getTransportStatus() == 0) ? "空闲" : "任务中");
+                }
                 driverListVo.setCarType(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getTruckType());
             }
         }