|
@@ -149,15 +149,17 @@ public class CommonServiceImpl implements CommonService {
|
|
|
|
|
|
|
|
//查询当前行车周期
|
|
//查询当前行车周期
|
|
|
WorkCycle workCycle = workCycleService.findCurrentWorkCycle(truckId);
|
|
WorkCycle workCycle = workCycleService.findCurrentWorkCycle(truckId);
|
|
|
- //完成订单列表
|
|
|
|
|
- List<WorkOrder> list =
|
|
|
|
|
- workOrderService.findCycleOrderList(workCycle.getId(), 1, WorkOrderEnum.COMPLETED.orderStatus());
|
|
|
|
|
- if (list != null && list.size() > 0) {
|
|
|
|
|
- workerInfo.setZhuangcheNumber(list.size());
|
|
|
|
|
- }
|
|
|
|
|
- list = workOrderService.findCycleOrderList(workCycle.getId(), 2, WorkOrderEnum.COMPLETED.orderStatus());
|
|
|
|
|
- if (list != null && list.size() > 0) {
|
|
|
|
|
- workerInfo.setXiecheNumber(list.size());
|
|
|
|
|
|
|
+ if (workCycle != null) {
|
|
|
|
|
+ //完成订单列表
|
|
|
|
|
+ List<WorkOrder> list =
|
|
|
|
|
+ workOrderService.findCycleOrderList(workCycle.getId(), 1, WorkOrderEnum.COMPLETED.orderStatus());
|
|
|
|
|
+ if (list != null && list.size() > 0) {
|
|
|
|
|
+ workerInfo.setZhuangcheNumber(list.size());
|
|
|
|
|
+ }
|
|
|
|
|
+ list = workOrderService.findCycleOrderList(workCycle.getId(), 2, WorkOrderEnum.COMPLETED.orderStatus());
|
|
|
|
|
+ if (list != null && list.size() > 0) {
|
|
|
|
|
+ workerInfo.setXiecheNumber(list.size());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
//位置信息
|
|
//位置信息
|
|
|
LocationVO locationVO = getLocationByDate(truckId, LocalDateTime.now());
|
|
LocationVO locationVO = getLocationByDate(truckId, LocalDateTime.now());
|