修复多媒体下试评和仲裁问题，屏蔽侧边栏

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

@@ -12,7 +12,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import cn.com.qmth.stmms.biz.campus.model.Campus;
 import cn.com.qmth.stmms.biz.campus.service.CampusService;
-import cn.com.qmth.stmms.biz.exam.model.Exam;
 import cn.com.qmth.stmms.biz.exam.model.ExamQuestion;
 import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
 import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
@@ -41,7 +40,6 @@ import cn.com.qmth.stmms.biz.mark.service.MarkSpecialTagService;
 import cn.com.qmth.stmms.biz.mark.service.MarkTrackService;
 import cn.com.qmth.stmms.biz.mark.service.TaskService;
 import cn.com.qmth.stmms.biz.mark.service.TrialService;
-import cn.com.qmth.stmms.common.enums.ExamType;
 import cn.com.qmth.stmms.common.enums.LibraryStatus;
 import cn.com.qmth.stmms.common.enums.MarkStatus;
 import cn.com.qmth.stmms.common.utils.PictureUrlBuilder;
@@ -92,16 +90,15 @@ public class TaskServiceImpl implements TaskService {
         List<Task> list = new LinkedList<Task>();
         query = libraryService.findByQuery(query);
         if (query.getCurrentCount() > 0) {
-            Exam exam = examService.findById(query.getExamId());
             for (MarkLibrary library : query.getResult()) {
-                list.add(build(library, exam.getType()));
+                list.add(build(library));
             }
         }
         return list;
     }
 
     @Override
-    public Task build(ArbitrateHistory history, MarkGroup group, ExamType examType) {
+    public Task build(ArbitrateHistory history, MarkGroup group) {
         ExamStudent student = studentService.findByExamIdAndExamNumber(history.getExamId(), history.getExamNumber());
         List<MarkLibrary> libraryList = libraryService.findByStudentAndGroup(student.getId(), group.getNumber());
         Integer campusId = libraryList.get(0).getCampusId();
@@ -116,10 +113,8 @@ public class TaskServiceImpl implements TaskService {
         task.setPictureConfig(group.getPictureConfigList());
         task.setSheetUrls(PictureUrlBuilder.getSheetUrls(student.getExamId(), campusId, student.getSubjectCode(),
                 student.getExamNumber(), student.getSheetCount()));
-        if (examType.equals(ExamType.MULTI_MEDIA)) {
-            task.setJsonUrl(PictureUrlBuilder.getAnswerJson(student.getExamId(), student.getSubjectCode(),
-                    student.getPaperType(), student.getExamNumber()));
-        }
+        task.setJsonUrl(PictureUrlBuilder.getAnswerJson(student.getExamId(), student.getSubjectCode(),
+                student.getPaperType(), student.getExamNumber()));
         task.setAnswerUrl(PictureUrlBuilder.getAnswerUrl(student.getExamId(), student.getSubjectCode()));
         task.setPaperUrl(PictureUrlBuilder.getPaperUrl(student.getExamId(), student.getSubjectCode()));
         task.setObjectiveScore(student.getObjectiveScore() != null ? student.getObjectiveScore() : 0);
@@ -143,7 +138,7 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public Task build(MarkLibrary library, ExamType examType) {
+    public Task build(MarkLibrary library) {
         ExamStudent student = studentService.findByExamIdAndExamNumber(library.getExamId(), library.getExamNumber());
         MarkGroup group = groupService.findOne(library.getExamId(), library.getSubjectCode(), library.getGroupNumber());
         Task task = new Task();
@@ -159,10 +154,8 @@ public class TaskServiceImpl implements TaskService {
         task.setPictureConfig(group.getPictureConfigList());
         task.setSheetUrls(PictureUrlBuilder.getSheetUrls(library.getExamId(), library.getCampusId(),
                 library.getSubjectCode(), library.getExamNumber(), student.getSheetCount()));
-        if (examType.equals(ExamType.MULTI_MEDIA)) {
-            task.setJsonUrl(PictureUrlBuilder.getAnswerJson(library.getExamId(), library.getSubjectCode(),
-                    student.getPaperType(), student.getExamNumber()));
-        }
+        task.setJsonUrl(PictureUrlBuilder.getAnswerJson(library.getExamId(), library.getSubjectCode(),
+                student.getPaperType(), student.getExamNumber()));
         task.setAnswerUrl(PictureUrlBuilder.getAnswerUrl(library.getExamId(), library.getSubjectCode()));
         task.setPaperUrl(PictureUrlBuilder.getPaperUrl(library.getExamId(), library.getSubjectCode()));
         task.setObjectiveScore(student != null ? student.getObjectiveScore() : 0);
@@ -201,6 +194,8 @@ public class TaskServiceImpl implements TaskService {
                 library.getSubjectCode(), library.getExamNumber(), student.getSheetCount()));
         task.setAnswerUrl(PictureUrlBuilder.getAnswerUrl(library.getExamId(), library.getSubjectCode()));
         task.setPaperUrl(PictureUrlBuilder.getPaperUrl(library.getExamId(), library.getSubjectCode()));
+        task.setJsonUrl(PictureUrlBuilder.getAnswerJson(library.getExamId(), library.getSubjectCode(),
+                student.getPaperType(), student.getExamNumber()));
         task.setObjectiveScore(student != null ? student.getObjectiveScore() : 0);
         if (history != null) {
             task.setMarkTime(history.getMarkerTime());

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

@@ -9,17 +9,16 @@ import cn.com.qmth.stmms.biz.mark.model.Task;
 import cn.com.qmth.stmms.biz.mark.model.TrialHistory;
 import cn.com.qmth.stmms.biz.mark.model.TrialLibrary;
 import cn.com.qmth.stmms.biz.mark.query.MarkLibrarySearchQuery;
-import cn.com.qmth.stmms.common.enums.ExamType;
 
 public interface TaskService {
 
     List<Task> findByQuery(MarkLibrarySearchQuery query);
 
-    Task build(ArbitrateHistory history, MarkGroup group, ExamType type);
+    Task build(ArbitrateHistory history, MarkGroup group);
 
     Task build(TrialLibrary library, TrialHistory history);
 
-    Task build(MarkLibrary library, ExamType examType);
+    Task build(MarkLibrary library);
 
     Task build(Integer studentId);
 

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

@@ -237,7 +237,6 @@ public class ArbitrateController extends BaseExamController {
             querySort = new Sort(d, "totalScore");
         }
         MarkGroup group = groupService.findOne(examId, subjectCode, groupNumber);
-        Exam exam = examService.findById(examId);
         List<Task> list = new LinkedList<Task>();
         if (subjectCheck(subjectCode, wu) && group != null) {
             ArbitrateHistorySearchQuery query = new ArbitrateHistorySearchQuery();
@@ -258,7 +257,7 @@ public class ArbitrateController extends BaseExamController {
             }
             query = arbitrateService.findByQuery(query);
             for (ArbitrateHistory history : query.getResult()) {
-                list.add(taskService.build(history, group, exam.getType()));
+                list.add(taskService.build(history, group));
             }
         }
         return list;
@@ -269,13 +268,12 @@ public class ArbitrateController extends BaseExamController {
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public Task getSingleTask(HttpServletRequest request, @RequestParam Integer historyId) {
         int examId = getSessionExamId(request);
-        Exam exam = examService.findById(examId);
         WebUser wu = RequestUtils.getWebUser(request);
         ArbitrateHistory history = arbitrateService.findById(historyId);
         if (history != null && history.getExamId().equals(examId) && subjectCheck(history.getSubjectCode(), wu)) {
             MarkGroup group = groupService.findOne(history.getExamId(), history.getSubjectCode(),
                     history.getGroupNumber());
-            return taskService.build(history, group, exam.getType());
+            return taskService.build(history, group);
         }
         Task task = new Task();
         task.setExist(false);
@@ -287,7 +285,6 @@ public class ArbitrateController extends BaseExamController {
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public Task getTask(HttpServletRequest request, @RequestParam String subjectCode, @RequestParam Integer groupNumber) {
         int examId = getSessionExamId(request);
-        Exam exam = examService.findById(examId);
         WebUser wu = RequestUtils.getWebUser(request);
         MarkGroup group = groupService.findOne(examId, subjectCode, groupNumber);
         if (subjectCheck(subjectCode, wu) && group != null) {
@@ -306,7 +303,7 @@ public class ArbitrateController extends BaseExamController {
                 for (ArbitrateHistory history : query.getResult()) {
                     // 尝试领取该任务并上锁
                     if (setCurrent(history.getId(), wu.getUser().getId())) {
-                        return taskService.build(history, group, exam.getType());
+                        return taskService.build(history, group);
                     } else {
                         continue;
                     }

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

@@ -319,7 +319,6 @@ public class MarkController extends BaseController {
     private Task getFormalTask(Marker marker) {
         int retry = 1;
         Task task = null;
-        Exam exam = examService.findById(marker.getExamId());
         while (task == null) {
             List<MarkLibrary> list = new ArrayList<MarkLibrary>();
             // 需要判断评卷员是否绑定了班级
@@ -330,7 +329,7 @@ public class MarkController extends BaseController {
             }
             for (MarkLibrary library : list) {
                 if (markService.applyLibrary(library, marker)) {
-                    task = taskService.build(library, exam.getType());
+                    task = taskService.build(library);
                     break;
                 }
             }

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

@@ -21,7 +21,6 @@
 
 <script src="${ctxStatic}/i18n/jquery.i18n.properties.js" type="text/javascript"></script>
 <script src="${ctxStatic}/i18n/load.js" type="text/javascript"></script>
-
 <script src="${ctxStatic}/rich-text/js/render.js"></script>
 <link href="${ctxStatic}/rich-text/css/rich-text.css" rel="stylesheet">
 <script type="text/javascript" src="${ctxStatic}/viewer/viewer.js"></script>
@@ -70,12 +69,6 @@
 					'arbitration-process': {
 					},
 					'warning-info': {
-					},
-					'view-sidebar':{
-						list: [
-							{title:'试卷',  url:'<c:if test="${subject.hasPaper==true}">${cardServer}${subject.paperUrl}</c:if>'},
-							{title:'答案',  url:'<c:if test="${subject.hasAnswer==true}">${cardServer}${subject.answerUrl}</c:if>'}
-						]
 					}
 				}
 			});

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

@@ -19,9 +19,10 @@
 <script src="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.js"></script>
 <link href="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.css" rel="stylesheet">
 
+<script src="${ctxStatic}/i18n/jquery.i18n.properties.js" type="text/javascript"></script>
+<script src="${ctxStatic}/i18n/load.js" type="text/javascript"></script>
 <script src="${ctxStatic}/rich-text/js/render.js"></script>
 <link href="${ctxStatic}/rich-text/css/rich-text.css" rel="stylesheet">
-
 <script type="text/javascript" src="${ctxStatic}/viewer/viewer.js"></script>
 <link href="${ctxStatic}/viewer/viewer.css" rel="stylesheet">
 
@@ -64,12 +65,6 @@
 					'arbitration-process': {
 					},
 					'warning-info': {
-					},
-					'view-sidebar':{
-						list: [
-							{title:'试卷',  url:'<c:if test="${subject.hasPaper==true}">${cardServer}${subject.paperUrl}</c:if>'},
-							{title:'答案',  url:'<c:if test="${subject.hasAnswer==true}">${cardServer}${subject.answerUrl}</c:if>'}
-						]
 					}
 				}
 			});

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

@@ -62,12 +62,6 @@
 					'quality-process': {
 					},
 					'warning-info': {
-					},
-					'view-sidebar':{
-						list: [
-							{title:'试卷',  url:'<c:if test="${subject.hasPaper==true}">${cardServer}${subject.paperUrl}</c:if>'},
-							{title:'答案',  url:'<c:if test="${subject.hasAnswer==true}">${cardServer}${subject.answerUrl}</c:if>'}
-						]
 					}
 				}
 			});

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markJson.jsp

@@ -87,12 +87,6 @@
 				</c:if>	
                 'change-name': {
                     url: '${ctx}/mark/change-name'
-                },
-                'view-sidebar': {
-                    list: [
-                        {title: '试卷', url: '<c:if test="${subject.hasPaper==true}">${cardServer}${subject.paperUrl}</c:if>'},
-                        {title: '答案', url: '<c:if test="${subject.hasAnswer==true}">${cardServer}${subject.answerUrl}</c:if>'}
-                    ]
                 }
             }
         });