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