[清退] bug提交

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -236,14 +236,18 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
                       .collect(Collectors.toList()))+"设备",userId);
               list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto2.getId(), 0, "省直属",repelStatusJudgeCount(deviceRepel.getRepelStatus(),count), ""));
         }
-        deviceRepelDetail.setId(null);
+        DeviceRepelDetail deviceRepelDetail1=new DeviceRepelDetail();
+        deviceRepelDetail1.setRepelId(deviceRepel1.getId());
+        deviceRepelDetail1.setRepelStatus(1);
+        deviceRepelDetail1.setSendUnitId(units.getUnitId());
+        deviceRepelDetail1.setSendUnit(units.getName());
         List<String> strings=new ArrayList<>();
         strings.add(units.getName());
-        deviceRepelDetail.setRepelType(3);
+        deviceRepelDetail1.setRepelType(3);
         count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),strings, seqNumbers,lifeStatus);
         log.info("[清退] 本级装备件数{}",count);
         if (correspondingLevel.get()&& count!=0){
-            TaskBto  taskBto1 =  oneselfTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),"省本级清退型号为"+ StringSplitUtil.stringListToString(deviceRepel.getModels().stream()
+            TaskBto  taskBto1 =  oneselfTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail1).getId(), taskBto.getId(),"省本级清退型号为"+ StringSplitUtil.stringListToString(deviceRepel.getModels().stream()
                     .distinct()
                     .collect(Collectors.toList()))+"设备",userId);
             list.add(new RepelTaskStatistical(deviceRepel1.getId(),taskBto.getId(),taskBto1.getId(),0,"省本级",repelStatusJudgeCount(deviceRepel.getRepelStatus(),count),""));