作业状态，车辆状态提交

src/main/java/com/aoyang/tms/controller/WorkOrderController.java

@@ -4,6 +4,8 @@ package com.aoyang.tms.controller;
 import com.alibaba.fastjson.JSON;
 import com.aoyang.tms.common.ErrCodeEnum;
 import com.aoyang.tms.controller.param.WorkOrderPageParam;
+import com.aoyang.tms.controller.vo.WorkOrderVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -40,6 +42,21 @@ public class WorkOrderController {
     @Resource
     private WorkOrderService workOrderService;
 
+    @ApiOperation(value = "运单详情", notes = "获取司机或押运员的运单详情")
+    @PostMapping("/find_work_order_info")
+    public Result<WorkOrderVO> findWorkOrderInfo(@RequestHeader(value = "orgId") Long orgId,
+                                                 @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
+        log.info("运单详情,/tms/work_order/find_work_order_info，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+
+        WorkOrder workOrder1 = workOrderService.getById(workOrder.getId());
+        WorkOrderVO vo = new WorkOrderVO();
+        BeanUtils.copyProperties(workOrder1, vo);
+        return new Result<>(vo);
+    }
+
     @ApiOperation(value = "获取运单分页列表", notes = "必传参数:orgId")
     @PostMapping("/page_list")
     public Result list(@RequestBody PageParam<WorkOrderPageParam> pageParam) {

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -1,7 +1,9 @@
 package com.aoyang.tms.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.common.result.Result;
+import com.aoyang.tms.common.ErrCodeEnum;
 import com.aoyang.tms.controller.vo.WorkOrderVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
 import com.aoyang.tms.entity.WorkOrder;
@@ -33,26 +35,24 @@ public class WorkerController {
     @Resource
     private CommonService commonService;
 
-    @ApiOperation(value = "运力详情", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
+    @ApiOperation(value = "运力详情", notes = "卡车id必传，包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
     public Result<WorkerInfo> findTruckInfo(@RequestHeader(value = "orgId") Long orgId,
-                                              @RequestHeader(value = "userId") Long userId, @RequestBody WorkerInfo workerInfo) {
-        return new Result<>(new WorkerInfo());
+                                            @RequestHeader(value = "userId") Long userId, @RequestBody WorkerInfo workerInfo) {
+        log.info("运力详情,/tms/worker/find_truck_info，参数:{}", JSON.toJSONString(workerInfo));
+        if (workerInfo == null || workerInfo.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        WorkerInfo workerInfo1 = commonService.findTruckInfo(workerInfo.getTruckId());
+        return new Result<>(workerInfo1);
     }
 
     @ApiOperation(value = "运单列表", notes = "获取司机或押运员的运单列表")
     @PostMapping("/find_work_order_page")
     public Result<IPage<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
-                                                           @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
+                                                        @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
         IPage<WorkOrderVO> records = null;
         return new Result<>(records);
     }
 
-    @ApiOperation(value = "运单详情", notes = "获取司机或押运员的运单详情")
-    @PostMapping("/find_work_order_info")
-    public Result<WorkOrderVO> findWorkOrderInfo(@RequestHeader(value = "orgId") Long orgId,
-                                                    @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
-        return new Result<>(new WorkOrderVO());
-    }
-
 }

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

@@ -51,6 +51,7 @@ public class CommonServiceImpl implements CommonService {
         workerInfo.setTruckId(truckId);
         Truck truck = findTruck(truckId);
         if (truck != null) {
+            workerInfo.setTruckStatus(truck.getTmsStatus());
             workerInfo.setCarNumber(truck.getCarNumber());
             workerInfo.setTrailerNumber(truck.getTrailerNumber());
         }