1
0
Pārlūkot izejas kodu

根据多媒体修改setting

ting.yin 4 gadi atpakaļ
vecāks
revīzija
d0711755ce

+ 3 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/InspectedController.java

@@ -323,11 +323,13 @@ public class InspectedController extends BaseExamController {
     public JSONObject getSetting(HttpServletRequest request, @RequestParam(required = false) String subjectCode) {
         JSONObject setting = new JSONObject();
         WebUser wu = RequestUtils.getWebUser(request);
+        int examId = getSessionExamId(request);
+        Exam exam = examService.findById(examId);
+        setting.accumulate("examType", exam.getType());
         setting.accumulate("fileServer", fileService.getFileServer());
         setting.accumulate("userName", wu.getName());
         setting.accumulate("splitConfig", getSplitConfig());
         if (StringUtils.isNotBlank(subjectCode)) {
-            int examId = getSessionExamId(request);
             ExamSubject examSubject = subjectService.find(examId, subjectCode);
             JSONObject subject = new JSONObject();
             subject.accumulate("name", examSubject.getName());

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

@@ -273,7 +273,6 @@ public class MarkController extends BaseController {
         setting.accumulate("startTime", exam.getStartTime() == null ? 0 : exam.getStartTime().getTime());
         setting.accumulate("endTime", exam.getEndTime() == null ? 0 : exam.getEndTime().getTime());
         setting.accumulate("topCount", marker.getTopCount() != null ? marker.getTopCount() : 0);
-        setting.accumulate("sheetView", group.isSheetView() && exam.isSheetView());
         setting.accumulate("enableAllZero", group.isEnableAllZero());
         setting.accumulate("statusValue", group.getStatus());
         setting.accumulate("groupNumber", group.getNumber());
@@ -281,12 +280,20 @@ public class MarkController extends BaseController {
                 group.getSubjectCode(), false, group.getNumber()));
         setting.accumulate("groupTitle", group.getTitle());
         setting.accumulate("fileServer", fileService.getFileServer());
-        setting.accumulate("forceSpecialTag", exam.isForceSpecialTag());
         setting.accumulate("uiSetting",
                 StringUtils.isBlank(marker.getMarkSetting()) ? new JSONObject() : marker.getMarkSetting());
         setting.accumulate("splitConfig", getSplitConfig());
         setting.accumulate("prefetchCount", prefetchCount);
-        setModeAndForceMode(setting, exam, marker, group);
+        if (ExamType.MULTI_MEDIA.equals(exam.getType())) {
+            setting.accumulate("mode", MarkMode.COMMON);
+            setting.accumulate("forceMode", true);
+            setting.accumulate("forceSpecialTag", false);
+            setting.accumulate("sheetView", false);
+        } else {
+            setModeAndForceMode(setting, exam, marker, group);
+            setting.accumulate("forceSpecialTag", exam.isForceSpecialTag());
+            setting.accumulate("sheetView", group.isSheetView() && exam.isSheetView());
+        }
         setSubjectAndSheetConfig(setting, marker, exam);
         setting.accumulate("userName", RequestUtils.getWebUser(request).getName());
         setProblemType(setting, marker);
@@ -718,11 +725,5 @@ public class MarkController extends BaseController {
         }
         setting.accumulate("mode", mode);
         setting.accumulate("forceMode", forceMode);
-
-        if (ExamType.MULTI_MEDIA.equals(exam.getType())) {
-            setting.accumulate("forceMode", true);
-            setting.accumulate("sheetView", false);
-            setting.accumulate("forceSpecialTag", false);
-        }
     }
 }