重车、空车逻辑

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

@@ -30,7 +30,7 @@ public interface WorkOrderService extends IService<WorkOrder> {
     /**
      * @return
      * @Author guoyong
-     * @Description 查询卡车最近的笔订单
+     * @Description 查询卡车当前行车周期最后一笔运单
      * @Date 2022/4/24
      * @Param
      **/

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

@@ -76,7 +76,7 @@ public class CommonServiceImpl implements CommonService {
             workerInfo.setTrailerNumber(truck.getTrailerNumber());
             workerInfo.setDeptId(truck.getDeptId());
             workerInfo.setDeptName(truck.getDeptName());
-
+            workerInfo.setIsZhongche("空车");
             WorkOrder workOrder = workOrderService.findCurrentWorkOrder(truckId);
             if (workOrder != null) {
                 //装车订单判断
@@ -100,7 +100,6 @@ public class CommonServiceImpl implements CommonService {
                         workerInfo.setIsZhongche("空车");
                     }
                 }
-
             }
         }
         log.info("findTruckInfo findTruckDrivers 参数:{}", JSON.toJSONString(truckId));

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

@@ -57,7 +57,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     public WorkOrder findCurrentWorkOrder(Long truckId) {
         QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>();
         queryWrapper.eq("truck_id", truckId);
-        queryWrapper.orderByDesc("create_date");
+        queryWrapper.orderByDesc("execute_time");
         queryWrapper.last("limit 1");
         WorkOrder workOrder = workOrderMapper.selectOne(queryWrapper);
         return workOrder;