|
@@ -12,7 +12,6 @@ import javax.persistence.criteria.Root;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.data.domain.Page;
|
|
import org.springframework.data.domain.Page;
|
|
-import org.springframework.data.domain.Sort;
|
|
|
|
import org.springframework.data.domain.Sort.Direction;
|
|
import org.springframework.data.domain.Sort.Direction;
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -56,6 +55,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
|
|
MarkLibrarySearchQuery query = new MarkLibrarySearchQuery();
|
|
MarkLibrarySearchQuery query = new MarkLibrarySearchQuery();
|
|
query.setPageNumber(pageNumber);
|
|
query.setPageNumber(pageNumber);
|
|
query.setPageSize(pageSize);
|
|
query.setPageSize(pageSize);
|
|
|
|
+ query.addSort("id", Direction.ASC);
|
|
return filterClass ? libraryDao.findUnMarkedFilterClass(examId, subjectCode, groupNumber, markerId, userId,
|
|
return filterClass ? libraryDao.findUnMarkedFilterClass(examId, subjectCode, groupNumber, markerId, userId,
|
|
statusSet, query) : libraryDao.findUnMarked(examId, subjectCode, groupNumber, markerId, statusSet,
|
|
statusSet, query) : libraryDao.findUnMarked(examId, subjectCode, groupNumber, markerId, statusSet,
|
|
query);
|
|
query);
|