首页订单列表调整，获取未完成的所有订单列表

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

@@ -155,7 +155,7 @@ public class WorkerController {
         return new Result<>(list);
     }
 
-    @ApiOperation(value = "首页订单列表", notes = "装车运单，只展示当前行车周期未完成的；除非当前已收车，则按排序展示第1个未完成的装车运单；卸车运单，重车时，才展示 ")
+    @ApiOperation(value = "首页订单列表", notes = "查询未完成的所有订单列表，按照计划到达时间由早到晚排序")
     @PostMapping("/find_index_order_list")
     public Result<List<WorkOrderVO>> findIndexOrderList(@RequestHeader(value = "orgId") Long orgId,
                                                         @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
@@ -163,7 +163,7 @@ public class WorkerController {
         if (workOrder == null || workOrder.getTruckId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        List<WorkOrderVO> list = workOrderService.findWorkOrderList(userId, workOrder);
+        List<WorkOrderVO> list = workOrderService.findNoCompleteOrderList(userId, workOrder);
         return new Result<>(list);
     }
 

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

@@ -73,11 +73,11 @@ public interface WorkOrderService extends IService<WorkOrder> {
     /**
      * @return
      * @Author guoyong
-     * @Description 根据卡车id获取待执行运单
+     * @Description 根据卡车id获取查询未完成的所有订单列表，按照计划到达时间由早到晚排序
      * @Date 2022/4/22
      * @Param userId, 当前用户id
      **/
-    List<WorkOrderVO> findWorkOrderList(Long userId, WorkOrder workOrder);
+    List<WorkOrderVO> findNoCompleteOrderList(Long userId, WorkOrder workOrder);
 
     /**
      * 根据组织id查询运力调度统计汇总信息

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

@@ -119,27 +119,17 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     }
 
     @Override
-    public List<WorkOrderVO> findWorkOrderList(Long userId, WorkOrder workOrderParam) {
-
-        List<WorkOrder> list = new ArrayList<>();
-        boolean zhongFlag = commonService.checkTruckZhong(workOrderParam.getTruckId());
-        // 如果当前车辆是空车，查找执行中的装车运单,有显示;如果没有，则查找第一个按照计划从早到晚的待执行装车;
-        if (!zhongFlag) {
-            WorkOrder workOrder = findWorkingOrder(workOrderParam.getTruckId(), 1);
-            if (workOrder == null) {
-                workOrder = findFirstTodoOrder(workOrderParam.getTruckId(), 1);
-            }
-
-            if (workOrder != null) {
-                list.add(workOrder);
-            }
-        }
-
-        // 如果当前车辆是重车，查找所有待执行卸车单
-        if (zhongFlag) {
-            list = findTodoOrderList(workOrderParam.getTruckId(), 2);
-        }
-
+    public List<WorkOrderVO> findNoCompleteOrderList(Long userId, WorkOrder workOrderParam) {
+        QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>();
+        queryWrapper.eq("truck_id", workOrderParam.getTruckId());
+        List<Integer> statusList = new ArrayList<>();
+        statusList.add(WorkOrderEnum.TODO.orderStatus());
+        statusList.add(WorkOrderEnum.GOTO_ZHUANGCHE_SPOT.orderStatus());
+        statusList.add(WorkOrderEnum.GOTO_XIECHE_SPOT.orderStatus());
+        statusList.add(WorkOrderEnum.ZHUANGCHE_RESULT_SUBMIT.orderStatus());
+        queryWrapper.in("order_status", statusList);
+        queryWrapper.orderByAsc("plan_reach_time");
+        List<WorkOrder> list = workOrderMapper.selectList(queryWrapper);
         List<WorkOrderVO> vos = new ArrayList<WorkOrderVO>();
         if (list != null && list.size() > 0) {
             for (WorkOrder workOrder : list) {