修改查询正在保洁中的保洁记录

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

@@ -296,13 +296,15 @@ public class SCleanRecordsServiceImpl extends ServiceImpl<SCleanRecordsMapper,SC
         LambdaQueryWrapper<SCleanRecords> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(SCleanRecords::getConsumerId,user.getId());
         queryWrapper.in(SCleanRecords::getStatus, CleaningStatusEnum.CLEANING.getCode());
-        SCleanRecords sCleanRecords = baseMapper.selectOne(queryWrapper);
-        if(sCleanRecords == null){
+        List<SCleanRecords> sCleanRecords = baseMapper.selectList(queryWrapper);
+        if (CollectionUtils.isEmpty(sCleanRecords)) {
             throw new RuntimeException("当前用户没有保洁任务");
         }
-        sCleanRecords.setsRoom(sRoomMapper.selectById(sCleanRecords.getRoomId()));
-        sCleanRecords.setsStore(sStoreMapper.selectById(sCleanRecords.getStoreId()));
-        return sCleanRecords;
+        //取创建时间最远的
+        SCleanRecords records = sCleanRecords.stream().min(Comparator.comparing(SCleanRecords::getCreateTime)).get();
+        records.setsRoom(sRoomMapper.selectById(records.getRoomId()));
+        records.setsStore(sStoreMapper.selectById(records.getStoreId()));
+        return records;
     }
 
     @Override