门店增加保洁状态

share-system/src/main/java/share/system/service/impl/SStoreServiceImpl.java

@@ -405,6 +405,9 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
         }
         //查询所有房间
         List<SRoomVo> roomVoList = sRoomService.listByStoreIds(storeIds);
+        List<Long> roomIdList = Optional.ofNullable(roomVoList).orElse(new ArrayList<>()).stream().map(SRoomVo::getId).collect(Collectors.toList());
+        List<SCleanRecords> sCleanRecordsList = cleanRecordsService.unCleanedListByRoomIds(roomIdList);
+        Map<Long, List<SCleanRecords>> recordsMap = Optional.ofNullable(sCleanRecordsList).orElse(new ArrayList<>()).stream().collect(Collectors.groupingBy(SCleanRecords::getRoomId));
         //查询所有设备
         List<Device> deviceList = deviceService.list();
         //遍历门店
@@ -412,6 +415,11 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
             List<SRoomVo> roomVos = new ArrayList<>();
             //遍历房间
             roomVoList.stream().forEach(room -> {
+                if (CollectionUtils.isNotEmpty(recordsMap.get(room.getId()))) {
+                    SCleanRecords records = recordsMap.get(room.getId()).get(0);
+                    room.setRecordsStatus(records.getStatus());
+                    room.setRecordsId(records.getId());
+                }
                 List<Device> devices = new ArrayList<>();
                 deviceList.stream().forEach(device -> {
                     if (room.getId().compareTo(device.getRoomId()) == 0) {