|
@@ -1564,7 +1564,10 @@ public class MarkServiceImpl implements MarkService {
|
|
|
query.setPageNumber(1);
|
|
|
query.setPageSize(1);
|
|
|
query.setSort(new Sort(Sort.Direction.DESC, "markerTime", "examNumber"));
|
|
|
- List<MarkLibrary> list = libraryDao.findByMarkerIdAndStatus(marker.getId(), LibraryStatus.MARKED, query);
|
|
|
+ Set<LibraryStatus> statusSet = new HashSet<>();
|
|
|
+ statusSet.add(LibraryStatus.MARKED);
|
|
|
+ statusSet.add(LibraryStatus.ARBITRATED);
|
|
|
+ List<MarkLibrary> list = libraryDao.findByMarkerIdAndStatus(marker.getId(),statusSet, query);
|
|
|
MarkLibrary library = list.isEmpty() ? null : list.get(0);
|
|
|
if (library != null && library.getMarkerTime() != null) {
|
|
|
long lastMarkTime = library.getMarkerTime().getTime();
|