Merge branch 'stmms_ft_dev' into test_20181225

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

@@ -229,16 +229,6 @@ public class MarkServiceImpl implements MarkService {
         return CurrentTaskUtil.exists(marker, getApplyTaskId(library));
     }
 
-    /**
-     * 释放某个评卷员某个锁定任务
-     * 
-     * @param marker
-     */
-    @Override
-    public void releaseLibrary(MarkLibrary library, Marker marker) {
-        CurrentTaskUtil.remove(marker, getApplyTaskId(library));
-    }
-
     /**
      * 释放某个评卷员的所有锁定任务
      * 
@@ -304,7 +294,8 @@ public class MarkServiceImpl implements MarkService {
      */
     @Override
     @Transactional
-    public void submitLibrary(MarkLibrary library, List<MarkTrack> trackList, List<MarkSpecialTag> tagList) {
+    public void submitLibrary(MarkLibrary library, Marker marker, List<MarkTrack> trackList,
+            List<MarkSpecialTag> tagList) {
         // 判断大题是否存在
         MarkGroup group = groupDao.findOne(library.getExamId(), library.getSubjectCode(), library.getGroupNumber());
         if (group == null) {
@@ -335,6 +326,8 @@ public class MarkServiceImpl implements MarkService {
                 // 条件不符更新失败，直接返回
                 return;
             }
+            // 释放任务
+            CurrentTaskUtil.remove(marker, getApplyTaskId(library));
             // 保存阅卷轨迹
             if (trackList != null) {
                 trackDao.deleteByLibraryId(library.getId());

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

@@ -60,13 +60,6 @@ public interface MarkService {
      */
     boolean hasApplied(MarkLibrary library, Marker marker);
 
-    /**
-     * 释放某个评卷员某个锁定任务
-     * 
-     * @param marker
-     */
-    void releaseLibrary(MarkLibrary library, Marker marker);
-
     /**
      * 释放某个评卷员的所有锁定任务
      * 
@@ -111,7 +104,7 @@ public interface MarkService {
      * @param trackList
      * @param tagList
      */
-    void submitLibrary(MarkLibrary library, List<MarkTrack> trackList, List<MarkSpecialTag> tagList);
+    void submitLibrary(MarkLibrary library, Marker marker, List<MarkTrack> trackList, List<MarkSpecialTag> tagList);
 
     /**
      * 管理员/组长直接对考生打分

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

@@ -261,8 +261,7 @@ public class MarkController extends BaseController {
                 library.setMarkerScoreList(task.getScoreList());
                 library.setStatus(LibraryStatus.MARKED);
                 library.setTags(StringUtils.trimToNull(task.getTags()));
-                markService.submitLibrary(library, task.getTrackList(library), task.getSpecialTagList(library));
-                markService.releaseLibrary(library, marker);
+                markService.submitLibrary(library, marker, task.getTrackList(library), task.getSpecialTagList(library));
                 result.accumulate("success", true);
                 result.accumulate("status", status(request));
             } else {

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

@@ -501,7 +501,6 @@ MarkControl.prototype.submitTask = function(submitUrl) {
     var submitUrl = submitUrl != undefined && submitUrl.length > 0 ? submitUrl : this.option.submitUrl;
 
     if (task != undefined && this.context.submitting != true) {
-    	
         //开启强制标记
         if(this.option.forceSpecialTag===true){
         	if(task.tagList==undefined ||task.tagList==null ||task.tagList.length <= 0){
@@ -510,30 +509,28 @@ MarkControl.prototype.submitTask = function(submitUrl) {
         	}
         }
         
-        task.markStepList = undefined;
-        task.pictureUrls = undefined;
-        task.pictureConfig = undefined;
-        task.sheetUrls = undefined;
-        task.paperUrl = undefined;
-        task.answerUrl = undefined;
-        task.imageData = undefined;
-        task.markFinish = undefined;
-        task.markTime = undefined;
-        task.arbitrationList = undefined;
+        var submitObj = $.extend(true, {}, task);
+        submitObj.markStepList = undefined;
+        submitObj.pictureUrls = undefined;
+        submitObj.pictureConfig = undefined;
+        submitObj.sheetUrls = undefined;
+        submitObj.paperUrl = undefined;
+        submitObj.answerUrl = undefined;
+        submitObj.imageData = undefined;
+        submitObj.markFinish = undefined;
+        submitObj.markTime = undefined;
+        submitObj.arbitrationList = undefined;
 
         this.trigger('task.submit.before');
         
         if (this.taskControl != undefined) {
             //已定义任务引擎
-            this.taskControl.submit(task, function(status) {
+            this.taskControl.submit(submitObj, function(status) {
                 if (status != undefined && status.valid == true) {
                     markControl.context.status = status;
                     markControl.trigger('mark.status.change', status);
                 }
-                //markControl.context.task = undefined;
                 markControl.trigger('task.submit.success');
-                markControl.trigger('mark.specialTag.success');
-                //markControl.getTask();
             }, function(message) {
                 markControl.trigger('task.submit.error', message);
             });
@@ -542,14 +539,12 @@ MarkControl.prototype.submitTask = function(submitUrl) {
             $.ajax({
                 url: submitUrl,
                 type: 'POST',
-        		data: JSON.stringify(task),
+        		data: JSON.stringify(submitObj),
         		dataType: "json",
         		contentType : 'application/json;charset=utf-8',
                 success: function(result) {
                     if (result.success == true) {
-                        //markControl.context.task = undefined;
                         markControl.trigger('task.submit.success');
-                        //markControl.getTask();
                     } else {
                         markControl.trigger('task.submit.error', result.message);
                     }
@@ -560,7 +555,6 @@ MarkControl.prototype.submitTask = function(submitUrl) {
             });
         } else {
             markControl.trigger('task.submit.success');
-            //markControl.getTask();
         }
     }
 }

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

@@ -153,8 +153,6 @@ MarkHistory.prototype.onSearch = function(pageNumber) {
 }
 
 MarkHistory.prototype.onTaskSelect = function(index) {
-    //初始化--特殊标识
-    this.markControl.trigger('mark.specialTag.success');
     var number = new String(index);
     if (this.taskList != undefined && index < this.taskList.length && this.loading != true) {
         this.container.list.find('tr').each(function(index, obj) {

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

@@ -505,20 +505,23 @@ MarkControl.prototype.submitTask = function(submitUrl) {
         	}
         }
         
-        task.markStepList = undefined;
-        task.pictureUrls = undefined;
-        task.sheetUrls = undefined;
-        task.imageData = undefined;
-        task.markFinish = undefined;
-        task.markTime = undefined;
-        task.paperUrl = undefined;
-        task.answerUrl = undefined;
+        var submitObj = $.extend(true, {}, task);
+        submitObj.markStepList = undefined;
+        submitObj.pictureUrls = undefined;
+        submitObj.pictureConfig = undefined;
+        submitObj.sheetUrls = undefined;
+        submitObj.paperUrl = undefined;
+        submitObj.answerUrl = undefined;
+        submitObj.imageData = undefined;
+        submitObj.markFinish = undefined;
+        submitObj.markTime = undefined;
+        submitObj.arbitrationList = undefined;
         
         this.trigger('task.submit.before');
         this.trigger('mark.specialTag.before');
         if (this.taskControl != undefined) {
             // 已定义任务引擎
-            this.taskControl.submit(task, function(status) {
+            this.taskControl.submit(submitObj, function(status) {
                 if (status != undefined && status.valid == true) {
                     markControl.context.status = status;
                     markControl.trigger('mark.status.change', status);
@@ -535,7 +538,7 @@ MarkControl.prototype.submitTask = function(submitUrl) {
             $.ajax({
                 url: submitUrl,
                 type: 'POST',
-                data: task,
+                data: submitObj,
                 success: function(result) {
                     if (result.success == true) {
                         // markControl.context.task = undefined;