|
|
@ -406,7 +406,8 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { |
|
|
|
List<WorkOrderInfoVo> records = result.getRecords(); |
|
|
|
List<WorkOrderInfoVo> filterRecords = records.stream() |
|
|
|
.filter(record -> record.getStatus() != null |
|
|
|
&& (record.getStatus() < 4 || record.getStatus() == 7)) |
|
|
|
&& (record.getStatus() == 1 || record.getStatus() == 2 || record.getStatus() == 7) |
|
|
|
) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
|
|
// 封装
|
|
|
@ -887,4 +888,18 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public TableDataInfo<WorkOrderInfoVo> dispatchList(WorkOrderInfoBo bo, PageQuery pageQuery) { |
|
|
|
LambdaQueryWrapper<WorkOrderInfo> lqw = buildQueryWrapper(bo); |
|
|
|
Page<WorkOrderInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); |
|
|
|
List<WorkOrderInfoVo> records = result.getRecords(); |
|
|
|
List<WorkOrderInfoVo> filterRecords = records.stream() |
|
|
|
.filter(record -> record.getStatus() != null |
|
|
|
&& (record.getStatus() == 0 || record.getStatus() == 3) |
|
|
|
) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
result.setRecords(filterRecords); |
|
|
|
return TableDataInfo.build(result); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|