提交 df0a9be9 authored 作者: zhoushaopan's avatar zhoushaopan

fix(维修模块): 修改查询维修装备是否可以被清退

修改查询维修装备是否可以被清退
上级 a868f057
...@@ -294,7 +294,7 @@ public class RepairDetailServiceImpl implements RepairDetailService { ...@@ -294,7 +294,7 @@ public class RepairDetailServiceImpl implements RepairDetailService {
//通过装备id查询出账单id (送修单repairBill) //通过装备id查询出账单id (送修单repairBill)
List<RepairDetail> repairDetails = deviceRepairDetailDao.findAllByDeviceIdIn(deviceIds); List<RepairDetail> repairDetails = deviceRepairDetailDao.findAllByDeviceIdIn(deviceIds);
//维修未入库 //维修未入库
List<RepairDetail> repairIngList = repairDetails.stream().filter(repairDetail -> repairDetail.getRepairStatus() == RepairStatusEnum.WAIT_REPAIR.id).sorted(Comparator.comparing(RepairDetail::getCreateTime)).collect(Collectors.toList()); List<RepairDetail> repairIngList = repairDetails.stream().filter(repairDetail -> Objects.equals(repairDetail.getRepairStatus(), RepairStatusEnum.WAIT_REPAIR.id)).sorted(Comparator.comparing(RepairDetail::getCreateTime)).collect(Collectors.toList());
//维修已入库 //维修已入库
List<Integer> repairStatus = new ArrayList<>(Arrays.asList(RepairStatusEnum.REPAIRING.id, RepairStatusEnum.WAIT_SEND.id)); List<Integer> repairStatus = new ArrayList<>(Arrays.asList(RepairStatusEnum.REPAIRING.id, RepairStatusEnum.WAIT_SEND.id));
List<RepairDetail> endRepairList = repairDetails.stream().filter(repairDetail -> repairStatus.contains(repairDetail.getRepairStatus())).sorted(Comparator.comparing(RepairDetail::getCreateTime)).collect(Collectors.toList()); List<RepairDetail> endRepairList = repairDetails.stream().filter(repairDetail -> repairStatus.contains(repairDetail.getRepairStatus())).sorted(Comparator.comparing(RepairDetail::getCreateTime)).collect(Collectors.toList());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论