修改前台页面展示的未保洁 保洁管理显示空闲

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

@@ -329,12 +329,17 @@ public class SCleanRecordsServiceImpl extends ServiceImpl<SCleanRecordsMapper,SC
         List<Long> orderRoomIds = Optional.ofNullable(orderList).orElse(new ArrayList<>()).parallelStream().map(SOrder::getRoomId).collect(Collectors.toList());
         List<SCleanRecords> hasOrderlist = list.stream().filter(item -> orderRoomIds.contains(item.getRoomId())).collect(Collectors.toList());
         List<SCleanRecords> nonOrderlist = list.stream().filter(item -> !orderRoomIds.contains(item.getRoomId())).collect(Collectors.toList());
+        List<SRoom> rooms = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(hasOrderlist)) {
             hasOrderlist.forEach(item -> {
                 item.setStatus(2);
                 item.setStartDate(now);
                 item.setEndDate(now);
                 item.setUpdateTime(now);
+                rooms.add(new SRoom() {{
+                    setId(item.getRoomId());
+                    setIsDirtyRoom(YesNoEnum.no.getIndex());
+                }});
             });
         }
         List<SRoom> dirtyRoomList = new ArrayList<>();
@@ -378,6 +383,9 @@ public class SCleanRecordsServiceImpl extends ServiceImpl<SCleanRecordsMapper,SC
         if (CollectionUtils.isNotEmpty(dirtyRoomList)) {
             roomService.updateBatchById(dirtyRoomList);
         }
+        if (CollectionUtils.isNotEmpty(rooms)) {
+            roomService.updateBatchById(rooms);
+        }
         return true;
     }