fix(维修模块): 解决了接收维修业务型号为空

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

@@ -1520,7 +1520,7 @@ public class RepairController {
         });
         //各单位阅知map
         Map<Integer, List<Integer>> messageMap = new HashMap<>();
-        List<DeviceLibrary> deviceLibraries = new ArrayList<>();
+//        List<DeviceLibrary> deviceLibraries = new ArrayList<>();
         for (Integer id : repairStatusChangeVo.getId()) {
             //获取维修详情单
             RepairDetail repairDetail1 = deviceRepairDetailService.getOne(id);
@@ -1532,7 +1532,7 @@ public class RepairController {
                 //在库
                 deviceLibrary.setLifeStatus(2);
                 deviceLibraryService.update(deviceLibrary);
-                deviceLibraries.add(deviceLibrary);
+//                deviceLibraries.add(deviceLibrary);
                 //存装备日志
                 DeviceLogDto deviceLogDto = new DeviceLogDto(deviceLibrary.getId(), "维修完成，装备状态改为在库", null, null);
                 deviceLogService.addLog(deviceLogDto);
@@ -1551,7 +1551,7 @@ public class RepairController {
                     repairDetail1.setNewDeviceDetailId(0);
                     DeviceLibrary deviceLibrary = deviceLibraryService.getOne(repairDetail1.getDeviceId());
                     deviceLibrary.setLifeStatus(5);
-                    deviceLibraries.add(deviceLibrary);
+//                    deviceLibraries.add(deviceLibrary);
                     deviceLibraryService.update(deviceLibrary);
                 }
                 deviceRepairDetailService.update(repairDetail1);
@@ -1602,8 +1602,14 @@ public class RepairController {
 //            MessageBto messageBto2 = new MessageBto(0, 5, "待领取送修装备，型号为"+
 //                    deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()), ids2,1,1);
 //            messageBto2.setRecord(StringSplitUtil.idListToString(messageMap.get(integer)));
-            MessageBto messageBto2 = new MessageBto(0, 5, "接收维修业务，型号为"+
-                    deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()), ids2,1,1);
+//            MessageBto messageBto2 = new MessageBto(0, 5, "接收维修业务，型号为"+
+//                    deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()), ids2,1,1);
+            Set<String> models = new HashSet<>();
+            repairStatusChangeVo.getId().forEach(i->{
+                 String model = deviceLibraryService.getOne(repairDetailService.getOne(i).getDeviceId()).getModel();
+                 models.add(model);
+            });
+            MessageBto messageBto2 = new MessageBto(0, 5, "接收维修业务，型号为"+models, ids2,1,1);
             messageBto2.setRecord(StringSplitUtil.idListToString(messageMap.get(integer)));
             messageService.add(messageBto2);
         });