修复客主观题导出、大题重置功能

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, "pk.subjectCode", "pk.mainNumber", "pk.subNumber"));
+        setSort(new Sort(Direction.ASC, "subjectCode", "mainNumber", "subNumber"));
     }
 
     public Integer getExamId() {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/dao/TrialLibraryDao.java

@@ -47,5 +47,9 @@ public interface TrialLibraryDao extends JpaRepository<TrialLibrary, Integer>, J
     @Modifying
     @Query("delete TrialLibrary m where m.studentId=?1")
     void deleteByStudentId(Integer studentId);
+    
+    @Modifying(clearAutomatically = true)
+    @Query("update TrialLibrary m set m.markCount=0  where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3")
+	void resetByExamIdAndSubjectCodeAndGroupNumber(Integer examId,String subjectCode, Integer number);
 
 }

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

@@ -909,6 +909,8 @@ public class MarkServiceImpl implements MarkService {
             trialTagDao.deleteByExamAndSubjectAndGroup(group.getExamId(), group.getSubjectCode(), group.getNumber());
             trialHistoryDao.deleteByExamIdAndSubjectCodeAndGroupNumber(group.getExamId(), group.getSubjectCode(),
                     group.getNumber());
+            trialLibraryDao.resetByExamIdAndSubjectCodeAndGroupNumber(group.getExamId(), group.getSubjectCode(),
+                    group.getNumber());
         }
         releaseByGroup(group);
     }

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, "pk.subjectCode"));
+        query.setSort(new Sort(Direction.ASC, "subjectCode"));
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);
         query = questionService.findByQuery(query);

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

@@ -238,7 +238,7 @@ public class StudentController extends BaseExamController {
             }
 
             for (ExamStudent student : list) {
-                if (StringUtils.isBlank(student.getStudentCode()) || StringUtils.isBlank(student.getName())
+                if (StringUtils.isBlank(student.getExamNumber()) || StringUtils.isBlank(student.getName())
                         || StringUtils.isBlank(student.getSubjectCode())
                         || StringUtils.isBlank(student.getSubjectName())
                         || StringUtils.isBlank(student.getCampusName())