Merge branch 'dev' of git.yfzx.zjtys.com.cn:matrix/device-back

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

@@ -68,6 +68,7 @@ public class AgainStorageBillServiceImpl implements AgainStorageBillService {
         List<DeviceLibrary> deviceLibraries=  deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(transitionOfLifeVo.getIds());
         AgainStorageBill againStorageBill= againStorageBillDao.save(new AgainStorageBill(StringUtils.ListToString(transitionOfLifeVo.getIds()),transitionOfLifeVo.getType()));
         String typeName;
+        List<String> seqList = deviceLibraries.stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList());
         switch (transitionOfLifeVo.getType()){
             case 0:
 //                deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.IN_LIBRARY.id,transitionOfLifeVo.getIds());
@@ -98,7 +99,8 @@ public class AgainStorageBillServiceImpl implements AgainStorageBillService {
 
         }
         TaskBto taskBto=againStorageTask(securityUser.getCurrentUserInfo().getUnitsId(),againStorageBill.getId(),securityUser.getCurrentUserInfo().getUserId(),typeName);
-        addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),securityUser.getUsername()+"执行了"+typeName,gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
+        addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"修改装备状态为"+typeName+":【"+seqList.stream()
+                .collect(Collectors.joining(","))+"】",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
         devLogAdd(deviceLibraries,typeName,securityUser.getCurrentUserInfo().getUserId());
     }