迁移货单地图功能增加车辆使用状态字段

performance-api/src/main/java/com/clx/performance/vo/pc/TruckCoordinateVO.java

@@ -30,6 +30,6 @@ public class TruckCoordinateVO {
     @ApiModelProperty(value = "车主手机号")
     private String mobile;
     @ApiModelProperty(value = "空重车状态 1:空车 2:运单-空车 3:运单-重车")
-    private Integer truckUserStatus;
+    private Integer truckUseStatus;
 
 }

performance-web/src/main/java/com/clx/performance/service/impl/GoodsOrderMapServiceImpl.java

@@ -84,11 +84,12 @@ public class GoodsOrderMapServiceImpl implements GoodsOrderMapService {
 
         for(TruckCoordinateDTO item : allTruckCoordinate){
             String truckNo = item.getTruckNo();
-            String name = Objects.nonNull(truckInfoMap.get(truckNo))?truckInfoMap.get(truckNo).getName():"";
-            String mobile = Objects.nonNull(truckInfoMap.get(truckNo))?truckInfoMap.get(truckNo).getMobile():"";
+            String name = Objects.nonNull(truckInfoMap.get(truckNo))?truckInfoMap.get(truckNo).getName():null;
+            String mobile = Objects.nonNull(truckInfoMap.get(truckNo))?truckInfoMap.get(truckNo).getMobile():null;
+            Integer truckUseStatus = Objects.nonNull(truckInfoMap.get(truckNo))?truckInfoMap.get(truckNo).getTruckOrderStatus():null;
 
             TruckCoordinateVO vo =  TruckCoordinateVO.builder().truckNo(item.getTruckNo()).longitudeX(item.getLongitudeX())
-                    .latitudeY(item.getLatitudeY()).name(name).mobile(mobile).build();
+                    .latitudeY(item.getLatitudeY()).name(name).mobile(mobile).truckUseStatus(truckUseStatus).build();
             result.add(vo);
         }
         return result;