feat(维修模块): 替换维修终止是中办的字段

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

@@ -22,7 +22,9 @@ import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.read.subject.bto.MessageBto;
+import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.entity.User;
+import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.RepairStatusEnum;
 import com.tykj.dev.misc.base.StatusEnum;
@@ -66,6 +68,9 @@ public class RepairDetailServiceImpl implements RepairDetailService {
     @Autowired
     private RepairBillDao repairBillDao;
 
+    @Autowired
+    private UnitsService unitsService;
+
     @Override
     public RepairDetail save(RepairDetail deviceRepairDetailEntity) {
         RepairDetail repairDetail = deviceRepairDetailDao.save(deviceRepairDetailEntity);
@@ -310,7 +315,9 @@ public class RepairDetailServiceImpl implements RepairDetailService {
         //通过装备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());
+        List<Units> superiorUnitsList = unitsService.findSuperiorUnitsList();
+        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());

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/UnitsService.java

@@ -159,6 +159,7 @@ public interface UnitsService extends PublicService<Units> {
 
     /**
      * 省入库上级单位对象查询接口
+     * 国家单位
      */
     List<Units> findSuperiorUnitsList();