[丢失、找回] 代码提交

dev-loss/src/main/java/com/tykj/dev/device/loss/service/impl/LossBillServiceImpl.java

@@ -97,7 +97,7 @@ public class LossBillServiceImpl implements LossBillService {
         addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起了装备丢失",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
 
         deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.LOSS.id,deviceLoss.getDevIdsList());
-        devLogAdd(deviceLoss.getDevIdsList(),"装备报备丢失", deviceLoss.getCreateUserId());
+        devLogAdd(deviceLoss.getDevIdsList(),"装备报备丢失", deviceLoss.getCreateUserId(),taskBto.getId());
     }
 
 
@@ -149,7 +149,7 @@ public class LossBillServiceImpl implements LossBillService {
             taskBto= newRetrieveCountyTask(parentUnits.getUnitId(), deviceLossThis.getId(), units.getName() + "找回装备任务",securityUser.getCurrentUserInfo().getUserId());
         }
         addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起装备找回业务",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
-        devLogAdd(deviceLoss.getDevIdsList(),"装备找回上报", deviceLoss.getCreateUserId());
+        devLogAdd(deviceLoss.getDevIdsList(),"装备找回上报", deviceLoss.getCreateUserId(),taskBto.getId());
     }
 
     @Override
@@ -238,10 +238,10 @@ public class LossBillServiceImpl implements LossBillService {
 
 
 
-    private void devLogAdd(List<Integer> ids, String remark,Integer userId){
+    private void devLogAdd(List<Integer> ids, String remark,Integer userId,Integer taskId){
         List<DeviceLog> logDtos=new ArrayList<>();
         deviceLibraryDao.findAllById(ids).forEach(
-                deviceLibrary -> logDtos.add(new DeviceLogDto(deviceLibrary.getId(), remark,null,userId).toDo())
+                deviceLibrary -> logDtos.add(new DeviceLogDto(deviceLibrary.getId(), remark,null,userId,taskId).toDo())
         );
         CompletableFuture.runAsync(() -> deviceLogService.saveAllLog(logDtos));
     }