Merge remote-tracking branch 'origin/stmms_ft_dev' into test_20181225

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/query/MarkLibrarySearchQuery.java

@@ -45,6 +45,10 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
         setSort(new Sort(Direction.ASC, "examNumber"));
     }
 
+    public void orderById() {
+        setSort(new Sort(Direction.ASC, "id"));
+    }
+
     public int getExamId() {
         return examId;
     }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkServiceImpl.java

@@ -211,10 +211,9 @@ public class MarkServiceImpl implements MarkService {
     @Override
     public boolean applyLibrary(MarkLibrary library, Marker marker) {
         // 首先判断多评情况下，同一个studentId是否已被该评卷员处理过
-        // if (libraryDao.countByStudentIdAndMarkerId(library.getStudentId(),
-        // marker.getId()) > 0) {
-        // return false;
-        // }
+        if (libraryDao.countByStudentIdAndMarkerId(library.getStudentId(), marker.getId()) > 0) {
+            return false;
+        }
         return CurrentTaskUtil.add(marker, getApplyTaskId(library));
     }
 

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/LibraryController.java

@@ -72,6 +72,7 @@ public class LibraryController extends BaseExamController {
         if (status != null) {
             query.addStatus(status);
         }
+        query.orderById();
         query = libraryService.findByQuery(query);
         for (MarkLibrary library : query.getResult()) {
             if (library.getMarkerId() != null) {

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/libraryList.jsp

@@ -164,7 +164,7 @@ $('#group-select').change(function(){
     $('#marker-select').empty();
     $('#marker-select').append('<option value="0">不限</option>');
     $('#marker-select').val('0').trigger('change');
-    if(subjectCode=='' || groupNumber==''){
+    if(subjectCode=='' || groupNumber==''||groupNumber==null){
         return;
     }
     $.post('${ctx}/admin/exam/marker/query', {subjectCode: subjectCode, groupNumber: groupNumber}, function(result){