订单列表添加已读

src/main/java/com/aoyang/tms/common/WorkOrderEnum.java

@@ -16,8 +16,8 @@ public enum WorkOrderEnum {
     //装车等待
     ZHUANGCHE_WAIT(20, "装车等待"),
 
-    //装车成果报备中
-    ZHUANGCHE_RESULT_SUBMIT(30, "成果报备"),
+    //装车磅单报备中
+    ZHUANGCHE_RESULT_SUBMIT(30, "磅单报备"),
 
     //前往卸车点
     GOTO_XIECHE_SPOT(10, "前往卸车点"),
@@ -25,8 +25,8 @@ public enum WorkOrderEnum {
     //卸车等待
     XIECHE_WAIT(20, "卸车等待"),
 
-    //卸车成果报备
-    XIECHE_RESULT_SUBMIT(30, "成果报备"),
+    //卸车磅单报备
+    XIECHE_RESULT_SUBMIT(30, "磅单报备"),
 
     //已完成
     COMPLETED(40, "已完成"),

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

@@ -59,7 +59,7 @@ public class WorkerController {
         return new Result<>(workerInfo1);
     }
 
-    @ApiOperation(value = "待执行运单列表", notes = "卡车id必传，移动端获取司机或押运员的待执行或执行中的运单列表")
+    @ApiOperation(value = "运单列表", notes = "卡车id必传，未完成的（待执行、前往、等待、成果报备中）运单")
     @PostMapping("/find_work_order_list")
     public Result<List<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
                                                        @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
@@ -83,18 +83,6 @@ public class WorkerController {
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "历史行车列表", notes = "必传参数:truckId")
-    @PostMapping("/work_cycle_page")
-    public Result work_cycle_page(@RequestBody PageParam<WorkCycle> pageParam) {
-        log.info("历史行车列表,/tms/worker/add_work_order_readinfo，参数:{}", JSON.toJSONString(pageParam));
-        if (pageParam == null || pageParam.getParam() == null || pageParam.getParam().getTruckId() == null) {
-            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
-        }
-        Page<WorkCycle> page = new Page<>(pageParam.getPage(), pageParam.getSize());
-        IPage<WorkCycle> records = workCycleService.page(page, Wrappers.query(pageParam.getParam()));
-        return new Result<>(records);
-    }
-
     @ApiOperation(value = "上报途中休息信息", notes = "必传参数:开始时间、结束时间必传")
     @PostMapping("/add_rest_info")
     public Result add_rest_info(@RequestBody RestInfo restInfo) {

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

@@ -60,7 +60,15 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, 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());
+        statusList.add(WorkOrderEnum.XIECHE_RESULT_SUBMIT.orderStatus());
+        statusList.add(WorkOrderEnum.ZHUANGCHE_WAIT.orderStatus());
+        statusList.add(WorkOrderEnum.XIECHE_WAIT.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) {