|
|
@@ -55,8 +55,21 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
private WorkOrderReadinfoService workOrderReadinfoService;
|
|
|
|
|
|
@Override
|
|
|
- public List<WorkOrderVO> findWorkOrderList(WorkOrder workOrder) {
|
|
|
- return null;
|
|
|
+ public List<WorkOrderVO> findWorkOrderList(WorkOrder workOrderParam) {
|
|
|
+ QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<WorkOrder>();
|
|
|
+ queryWrapper.eq("truck_id", workOrderParam.getTruckId());
|
|
|
+ List<Integer> statusList = new ArrayList<>();
|
|
|
+ statusList.add(WorkOrderEnum.TODO.orderStatus());
|
|
|
+ queryWrapper.in("order_status", statusList);
|
|
|
+ List<WorkOrder> list = workOrderMapper.selectList(queryWrapper);
|
|
|
+ List<WorkOrderVO> vos = new ArrayList<WorkOrderVO>();
|
|
|
+ if (list != null && list.size() > 0) {
|
|
|
+ for (WorkOrder workOrder : list) {
|
|
|
+ WorkOrderVO vo = new WorkOrderVO();
|
|
|
+ BeanUtils.copyProperties(workOrder, vo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return vos;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -124,7 +137,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
readInfo.setDriverType(0);
|
|
|
if (read == null) {
|
|
|
readInfo.setReadFlag(0);
|
|
|
- readInfo.setMinutes((int)Duration.between(vo.getCreateDate(), LocalDateTime.now()).toMinutes());
|
|
|
+ readInfo.setMinutes((int) Duration.between(vo.getCreateDate(), LocalDateTime.now()).toMinutes());
|
|
|
} else {
|
|
|
readInfo.setReadFlag(1);
|
|
|
}
|
|
|
@@ -142,7 +155,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
readInfo.setDriverType(1);
|
|
|
if (read == null) {
|
|
|
readInfo.setReadFlag(0);
|
|
|
- readInfo.setMinutes((int)Duration.between(vo.getCreateDate(), LocalDateTime.now()).toMinutes());
|
|
|
+ readInfo.setMinutes((int) Duration.between(vo.getCreateDate(), LocalDateTime.now()).toMinutes());
|
|
|
} else {
|
|
|
readInfo.setReadFlag(1);
|
|
|
}
|