运单详情

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

@@ -78,7 +78,7 @@ public class WorkOrderController {
         if (param == null || param.getId() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        return new Result<>(workOrderService.getById(param));
+        return new Result<>(workOrderService.getOne(param));
     }
 
     @ApiOperation(value = "根据id中止运单(运单分页列表PC端)", notes = "必传参数:id,orderStatus=60")

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

@@ -0,0 +1,17 @@
+package com.aoyang.tms.controller.vo;
+
+import com.aoyang.tms.entity.WorkOrder;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WorkOrderDetail{
+
+    @ApiModelProperty(value = "运单")
+    private WorkOrder workOrder;
+
+    @ApiModelProperty(value = "线路GPS数据")
+    private List<String> routeGps;
+}

src/main/java/com/aoyang/tms/service/WorkOrderService.java

@@ -3,12 +3,9 @@ package com.aoyang.tms.service;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.param.WorkManagePageParam;
-import com.aoyang.tms.controller.vo.TruckOrderManageVO;
-import com.aoyang.tms.controller.vo.TruckOrderStatisticsVO;
+import com.aoyang.tms.controller.vo.*;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.controller.param.WorkOrderPageParam;
-import com.aoyang.tms.controller.vo.WorkOrderPageListVO;
-import com.aoyang.tms.controller.vo.WorkOrderVO;
 import com.aoyang.tms.entity.Shipper;
 import com.aoyang.tms.entity.Truck;
 import com.aoyang.tms.entity.WorkOrder;
@@ -75,4 +72,6 @@ public interface WorkOrderService extends IService<WorkOrder> {
      * @Param
      **/
     IPage<WorkOrderPageListVO> findPage(PageParam<WorkOrderPageParam> pageParam);
+
+    WorkOrderDetail getOne(WorkOrder param);
 }

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

@@ -13,6 +13,7 @@ import com.aoyang.tms.mapper.WorkOrderMapper;
 import com.aoyang.tms.service.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.BeanUtils;
@@ -327,4 +328,23 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         workOrderPageListVOIPage.setCurrent(records.getCurrent());
         return workOrderPageListVOIPage;
     }
+
+    @Override
+    public WorkOrderDetail getOne(WorkOrder param) {
+        WorkOrderDetail workOrderDetail = new WorkOrderDetail();
+        WorkOrder workOrder = getById(param);
+        if (workOrder != null) {
+            workOrderDetail.setWorkOrder(workOrder);
+            List<String> routeGps = new ArrayList<>();
+            if (workOrder.getCompleteTime() != null) {
+                routeGps = commonService.getLocationtrip(workOrder.getTruckId(), workOrder.getExecuteTime(), workOrder.getCompleteTime());
+            } else {
+                routeGps = commonService.getLocationtrip(workOrder.getTruckId(), workOrder.getExecuteTime(), LocalDateTime.now());
+            }
+            if (routeGps != null) {
+                workOrderDetail.setRouteGps(routeGps);
+            }
+        }
+        return workOrderDetail;
+    }
 }