增加客主观题导出和显示按试卷类型排序

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamQuestionDao.java

@@ -12,7 +12,7 @@ import cn.com.qmth.stmms.biz.exam.model.ExamQuestion;
 public interface ExamQuestionDao extends JpaRepository<ExamQuestion, Integer>, JpaSpecificationExecutor<ExamQuestion> {
 
     @Query("select q from ExamQuestion q where q.examId=?1 and q.subjectCode=?2 and q.objective=?3 "
-            + "order by q.mainNumber, q.subNumber")
+            + "order by q.paperType, q.mainNumber, q.subNumber")
     public List<ExamQuestion> findByExamIdAndSubjectCodeAndObjective(Integer examId, String subjectCode,
             boolean objective);
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/query/ExamQuestionSearchQuery.java

@@ -25,7 +25,7 @@ public class ExamQuestionSearchQuery extends BaseQuery<ExamQuestion> {
     private Double zeroRateGt;
 
     public void orderBySubjectAndNumber() {
-        setSort(new Sort(Direction.ASC, "subjectCode", "mainNumber", "subNumber"));
+        setSort(new Sort(Direction.ASC, "subjectCode","paperType", "mainNumber", "subNumber"));
     }
 
     public Integer getExamId() {

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

@@ -500,6 +500,7 @@ public class MarkServiceImpl implements MarkService {
                         }
                         trialLibraryDao.updateMarkCount(library.getId(),
                                 (int) trialHistoryDao.countByLibraryId(library.getId()));
+                        updateLibraryCount(group);
                         releaseLibrary(library, marker);
                         return true;
                     }

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

@@ -144,7 +144,7 @@ public class PaperController extends BaseExamController {
         ExamQuestionSearchQuery query = new ExamQuestionSearchQuery();
         query.setExamId(examId);
         query.setObjective(objective);
-        query.setSort(new Sort(Direction.ASC, "subjectCode"));
+        query.setSort(new Sort(Direction.ASC, "subjectCode","paperType", "mainNumber", "subNumber"));
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);
         query = questionService.findByQuery(query);