合并分支 'bug' 到 'master'

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

@@ -2294,9 +2294,6 @@ public class RepairController {
             String currentUserUnitName = userUtils.getCurrentUserUnitName();
             //查询维修详情
             List<RepairDetail> byDeviceRepairBillId = repairDetailDao.findByDeviceRepairBillId(repairBill.getId());
-            //进行过滤
-//            List<RepairDetail> repairDetails = byDeviceRepairBillId.stream().filter(repairDetail -> repairDetail.getRepairBackBillId() == null && repairDetail.getRepairStatus().equals(RepairStatusEnum.WAIT_REPAIR.id) && repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit()))
-//                    .collect(Collectors.toList());
             List<RepairDetail> repairDetails = byDeviceRepairBillId.stream().filter(repairDetail -> {
                 if (!repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit())) {
                     return repairDetail.getRepairBackBillId() == null && repairDetail.getRepairStatus().equals(RepairStatusEnum.WAIT_REPAIR.id) && repairDetail.getLocationUnit().equals(currentUserUnitName);
@@ -2305,9 +2302,11 @@ public class RepairController {
                 }
             }).collect(Collectors.toList());
             repairDetails.forEach(repairDetail -> {
-                repairDetail.setDeviceRepairBillId(0);
+                if (repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit())){
+                    repairDetail.setDeviceRepairBillId(0);
+                }
+
                 repairDetail.setRepairStatus(RepairStatusEnum.WAIT_SEND.id);
-                repairDetail.setLocationUnit(repairDetail.getOwnUnit());
                 repairDetailDao.save(repairDetail);
             });
             //直接删除维修单
@@ -2380,9 +2379,11 @@ public class RepairController {
             List<RepairDetail> repairDetails = byRepairBackBillId.stream().filter(repairDetail -> repairDetail.getDeviceRepairBillId() != null && !repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit()) && repairDetail.getRepairStatus().equals(RepairStatusEnum.RECEIVE_WAIT_STORAGE.id) && repairDetail.getLocationUnit().equals(currentUserUnitName))
                     .collect(Collectors.toList());
             for (RepairDetail repairDetail : repairDetails) {
-                repairDetail.setRepairBackBillId(0);
+                if (!repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit())){
+                    repairDetail.setRepairBackBillId(0);
+                }
                 repairDetail.setRepairStatus(2);
-                repairDetail.setLocationUnit(repairDetail.getOwnUnit());
+//                repairDetail.setLocationUnit(repairDetail.getOwnUnit());
                 repairDetailDao.save(repairDetail);
             }
             //删除账单