feat(维修模块): 修复了维修撤回和维修退回的装备的所属所在

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -2244,11 +2244,10 @@ public class RepairController {
         Integer parentTaskId = taskBto.getParentTaskId();
 
         TaskBto parentTask = taskService.get(parentTaskId);
-        //父任务未被完成 可以被撤回r
+        //父任务未被完成 可以被撤回
         Integer billId = taskBto.getBillId();
         String title = taskBto.getTitle();
 
-//        AllotBill allotBill = allotBillService.getOne(billId);
         RepairBill repairBill = repairBillService.getOne(billId);
         Integer currentUserId = userUtils.getCurrentUserId();
         List<Integer> idList = userPublicService.findOtherUser(currentUserId);
@@ -2308,6 +2307,7 @@ public class RepairController {
             repairDetails.forEach(repairDetail -> {
                 repairDetail.setDeviceRepairBillId(0);
                 repairDetail.setRepairStatus(RepairStatusEnum.WAIT_SEND.id);
+                repairDetail.setLocationUnit(repairDetail.getOwnUnit());
                 repairDetailDao.save(repairDetail);
             });
             //直接删除维修单
@@ -2382,6 +2382,7 @@ public class RepairController {
             for (RepairDetail repairDetail : repairDetails) {
                 repairDetail.setRepairBackBillId(0);
                 repairDetail.setRepairStatus(2);
+                repairDetail.setLocationUnit(repairDetail.getOwnUnit());
                 repairDetailDao.save(repairDetail);
             }
             //删除账单
@@ -2438,9 +2439,7 @@ public class RepairController {
     }
 
     private List<RepairDetail> sortMethod(List<CustomOrder> orders, List<RepairDetail> repairDetails2, List<RepairDetail> repairDetails1){
-//        List<CustomOrder> orders = repairTaskSelectVo.getOrders();
         List<String> list = orders.stream().map(CustomOrder::getDirection).collect(Collectors.toList());
-//        List<RepairDetail> repairDetails2 = repairDetails1.stream().sorted(Comparator.comparing(RepairDetail::getUpdateTime)).collect(Collectors.toList());
         List<RepairDetail> finalList = new ArrayList<>();
         boolean b = list.stream().allMatch(Objects::isNull);
         if (b){
@@ -2465,8 +2464,6 @@ public class RepairController {
     }
 
     private List<EquipmentReceivedVo> sortMethod2(List<CustomOrder> orders,List<EquipmentReceivedVo> equipmentReceivedVos,List<EquipmentReceivedVo> waitingRepairEquipmentVoList){
-//        List<EquipmentReceivedVo> equipmentReceivedVoList = equipmentReceivedVos.stream().sorted(Comparator.comparing(EquipmentReceivedVo::getUpdateTime)).collect(Collectors.toList());
-
         List<String> list = orders.stream().map(CustomOrder::getDirection).collect(Collectors.toList());
         List<EquipmentReceivedVo> finalList = new ArrayList<>();
         boolean b = list.stream().allMatch(Objects::isNull);