fix(维修模块): 新增clearTaskVo中在中办的集合

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

@@ -290,18 +290,22 @@ public class RepairDetailServiceImpl implements RepairDetailService {
     }
 
     /**
-     * 查询哪些装备正在运输中(出库方已发起，但是入库方未入库)
+     * 查询哪些装备正在运输中(出库方已发起，但是入库方未入库) 装备是否在中办
      */
     @Override
     public ClearRepairVo underRepair(List<Integer> deviceIds){
         ClearRepairVo clearRepairVo = new ClearRepairVo();
         //通过装备id查询出账单id (送修单repairBill)
         List<RepairDetail> repairDetails = deviceRepairDetailDao.findAllByDeviceIdIn(deviceIds);
+        //过滤出装备在中办的
+        List<RepairDetail> exceptionList = repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().contains("中办")).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> 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());
+        clearRepairVo.setExceptionList(exceptionList);
         clearRepairVo.setRepairingList(repairIngList);
         clearRepairVo.setEndRepairList(endRepairList);
         return clearRepairVo;

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/ClearRepairVo.java

@@ -21,4 +21,7 @@ public class ClearRepairVo {
 
     @ApiModelProperty(value = "已入库的维修详情列表")
     private List<RepairDetail> endRepairList;
+
+    @ApiModelProperty(value = "在中办的装备")
+    private List<RepairDetail> exceptionList;
 }