WorkerInfo

src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -51,6 +51,24 @@ public class WorkerInfo {
     @ApiModelProperty(value = "挂车牌号")
     private String trailerNumber;
 
+    @ApiModelProperty(value = "订单状态,待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已作废60")
+    private int orderStatus;
+
+    @ApiModelProperty(value = "车辆状态,已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
+    private Integer truckStatus;
+
+    @ApiModelProperty(value = "已用时，单位分")
+    private int time;
+
+    @ApiModelProperty(value = "直接返回文字空车或重车")
+    private int isZhongche;
+
+    @ApiModelProperty(value = "装车运单数量")
+    private int zhuangcheNumber;
+
+    @ApiModelProperty(value = "卸车运单数量")
+    private int xiecheNumber;
+
     @ApiModelProperty(value = "位置经度")
     private String longitude;
 
@@ -60,11 +78,5 @@ public class WorkerInfo {
     @ApiModelProperty(value = "位置时间")
     private String localTime;
 
-//    @ApiModelProperty(value = "订单状态,待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已作废60")
-//    private int orderStatus;
-
-    @ApiModelProperty(value = "车辆状态,已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
-    private Integer truckStatus;
-
 
 }

src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -66,6 +66,12 @@ public class CommonServiceImpl implements CommonService {
             workerInfo.setTrailerNumber(truck.getTrailerNumber());
             workerInfo.setDeptId(truck.getDeptId());
             workerInfo.setDeptName(truck.getDeptName());
+
+            //已收车
+            if (truck.getTmsStatus() == 0) {
+                workerInfo.setZhuangcheNumber(0);
+                workerInfo.setXiecheNumber(0);
+            }
         }
         log.info("findTruckInfo findTruckDrivers 参数:{}", JSON.toJSONString(truckId));
         List<TruckDriver> truckDrivers = truckDriverService.findTruckDrivers(truckId);