feat(维修模块): 新增维修终止的已维修待入库

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairDetailServiceImpl.java

@@ -319,13 +319,13 @@ public class RepairDetailServiceImpl implements RepairDetailService {
         List<String> names = superiorUnitsList.stream().map(Units::getName).collect(Collectors.toList());
         List<RepairDetail> exceptionList = repairDetails.stream().filter(repairDetail -> names.contains(repairDetail.getLocationUnit())).sorted(Comparator.comparing(RepairDetail::getCreateTime)).collect(Collectors.toList());
         repairDetails.removeAll(exceptionList);
-        //维修未入库   等待维修分为接收区装备和市发起维修  修好退回待领取
+        //维修未入库   等待维修分为接收区装备和市发起维修
 //        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> repairStatus1 = new ArrayList<>(Arrays.asList(RepairStatusEnum.WAIT_REPAIR.id,RepairStatusEnum.WAIT_RECEIVE.id));
+        List<Integer> repairStatus1 = new ArrayList<>(Collections.singletonList(RepairStatusEnum.WAIT_REPAIR.id));
         List<RepairDetail> repairIngList = repairDetails.stream().filter(repairDetail -> repairStatus1.contains(repairDetail.getRepairStatus()))
                 .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,RepairStatusEnum.WAIT_RECEIVE.id,RepairStatusEnum.RECEIVE_WAIT_STORAGE.id));
         List<RepairDetail> endRepairList = repairDetails.stream().filter(repairDetail -> repairStatus.contains(repairDetail.getRepairStatus())).sorted(Comparator.comparing(RepairDetail::getCreateTime)).collect(Collectors.toList());
         clearRepairVo.setExceptionList(exceptionList);
         clearRepairVo.setRepairingList(repairIngList);