修复评卷提交错误，评卷任务重置不彻底，增加评卷未特殊标记提示

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

@@ -53,7 +53,7 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
     void resetByExamId(Integer examId, LibraryStatus status);
 
     @Modifying(clearAutomatically = true)
-    @Query("update MarkLibrary m set m.status=?4, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3")
+    @Query("update MarkLibrary m set m.status=?4, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null , m.header_id=null , m.header_time=null , m.header_score=null , m.header_score_list=null where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3")
     void resetByExamIdAndSubjectCodeAndNumber(Integer examId, String subjectCode, Integer number, LibraryStatus status);
 
     @Modifying(clearAutomatically = true)

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -277,7 +277,7 @@ public class MarkController extends BaseController {
         try {
             task.setSpent((new Date().getTime() - task.getSpent()) / 1000);
             MarkLibrary library = libraryService.findById(task.getLibraryId());
-            if (library != null && library.getStatus() == LibraryStatus.WAITING) {
+            if (library != null && library.getStatus() != LibraryStatus.ARBITRATED && library.getStatus() != LibraryStatus.WAIT_ARBITRATE) {
                 library.setMarkerId(marker.getId());
                 library.setMarkerTime(new Date());
                 library.setMarkerScore(task.getTotalScore());

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

@@ -191,7 +191,7 @@
 				<td>${student.markName}</td>
 				<td>
 					<a class="sheet-link" href="##" data-sheet-url="${student.sheetUrlString}" data-answer-url="<c:if test="${student.answerUrl!=null}">${cardServer}${student.answerUrl}</c:if>" data-title="${student.examNumber}&nbsp;&nbsp;${student.name}&nbsp;&nbsp;客观总分${student.objectiveScoreString}&nbsp;&nbsp;主观总分${student.subjectiveScoreString}&nbsp;&nbsp;全卷总分${student.totalScoreString}">原图</a>
-					<a class="track-link" href="##" data-image-url="${ctx}/admin/exam/track?studentId=${student.id}" data-title="${student.examNumber}&nbsp;&nbsp;${student.name}">阅卷轨迹</a>
+<%-- 					<a class="track-link" href="##" data-image-url="${ctx}/admin/exam/track?studentId=${student.id}" data-title="${student.examNumber}&nbsp;&nbsp;${student.name}">阅卷轨迹</a> --%>
 					<a class="package-link" href="##" data-image-url="${student.packageUrlString}" data-title="${student.packageCode}">签到表</a>
 <%-- 					<a target="_blank" href="${ctx}/admin/mark/leader/index?studentId=${student.id}">给分</a> --%>
 				</td>

stmms-web/src/main/webapp/static/mark-new/js/mark-control.js

@@ -244,6 +244,10 @@ MarkControl.prototype.initTriggers = function(option) {
         context.task = undefined;
         self.getTask();
     });
+    
+    this.on('task.submit.forceSpecialTag', this, function(event, context, eventObject) {
+        
+    });
 
     $(document).keypress(this, function(event) {
         if (self.context.listenKeyboard != false) {
@@ -501,6 +505,7 @@ MarkControl.prototype.submitTask = function(submitUrl) {
         //开启强制标记
         if(this.option.forceSpecialTag===true){
         	if(task.tagList==undefined ||task.tagList==null ||task.tagList.length <= 0){
+        		markControl.trigger('task.submit.forceSpecialTag');
         		return;
         	}
         }

stmms-web/src/main/webapp/static/mark-new/js/modules/warning-info.js

@@ -45,6 +45,9 @@ function WarningInfo(option) {
     this.markControl.on('task.submit.error', this, function(event, context, eventObject) {
         this.toggle(true, '网络异常，任务提交失败', '关闭');
     });
+    this.markControl.on('task.submit.forceSpecialTag', this, function(event, context, eventObject) {
+        this.toggle(true, '强制特殊标记已开启，至少使用一个特殊标记', '关闭');
+    });
 }
 
 WarningInfo.prototype.init = function() {

stmms-web/src/main/webapp/static/mark-track/js/mark-control.js

@@ -500,6 +500,7 @@ MarkControl.prototype.submitTask = function(submitUrl) {
         //开启强制标记
         if(this.option.forceSpecialTag===true){
         	if(task.tagList==undefined ||task.tagList==null ||task.tagList.length <= 0){
+        		markControl.trigger('task.submit.forceSpecialTag');
         		return;
         	}
         }

stmms-web/src/main/webapp/static/mark-track/js/modules/warning-info.js

@@ -45,6 +45,9 @@ function WarningInfo(option) {
     this.markControl.on('task.submit.error', this, function(event, context, eventObject) {
         this.toggle(true, '网络异常，任务提交失败', '关闭');
     });
+    this.markControl.on('task.submit.forceSpecialTag', this, function(event, context, eventObject) {
+        this.toggle(true, '强制特殊标记已开启，至少使用一个特殊标记', '关闭');
+    });
 }
 
 WarningInfo.prototype.init = function() {