|
@@ -9,6 +9,7 @@ import java.util.Map;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
import cn.com.qmth.stmms.biz.exam.dao.SelectiveStudentDao;
|
|
import cn.com.qmth.stmms.biz.exam.dao.SelectiveStudentDao;
|
|
|
|
+import cn.com.qmth.stmms.common.enums.*;
|
|
import org.apache.commons.lang.StringEscapeUtils;
|
|
import org.apache.commons.lang.StringEscapeUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
@@ -55,16 +56,6 @@ import cn.com.qmth.stmms.biz.school.service.SchoolService;
|
|
import cn.com.qmth.stmms.common.annotation.Logging;
|
|
import cn.com.qmth.stmms.common.annotation.Logging;
|
|
import cn.com.qmth.stmms.common.annotation.RoleRequire;
|
|
import cn.com.qmth.stmms.common.annotation.RoleRequire;
|
|
import cn.com.qmth.stmms.common.domain.WebUser;
|
|
import cn.com.qmth.stmms.common.domain.WebUser;
|
|
-import cn.com.qmth.stmms.common.enums.ArbitrateType;
|
|
|
|
-import cn.com.qmth.stmms.common.enums.ExamType;
|
|
|
|
-import cn.com.qmth.stmms.common.enums.LockType;
|
|
|
|
-import cn.com.qmth.stmms.common.enums.LogType;
|
|
|
|
-import cn.com.qmth.stmms.common.enums.MarkMode;
|
|
|
|
-import cn.com.qmth.stmms.common.enums.MarkStatus;
|
|
|
|
-import cn.com.qmth.stmms.common.enums.Role;
|
|
|
|
-import cn.com.qmth.stmms.common.enums.ScorePolicy;
|
|
|
|
-import cn.com.qmth.stmms.common.enums.SubjectiveStatus;
|
|
|
|
-import cn.com.qmth.stmms.common.enums.ThirdPolicy;
|
|
|
|
import cn.com.qmth.stmms.common.utils.RequestUtils;
|
|
import cn.com.qmth.stmms.common.utils.RequestUtils;
|
|
import net.sf.json.JSONArray;
|
|
import net.sf.json.JSONArray;
|
|
import net.sf.json.JSONObject;
|
|
import net.sf.json.JSONObject;
|
|
@@ -356,7 +347,8 @@ public class MarkGroupController extends BaseExamController {
|
|
model.addAttribute("markModeList", MarkMode.values());
|
|
model.addAttribute("markModeList", MarkMode.values());
|
|
|
|
|
|
model.addAttribute("scorePolicyList", ScorePolicy.getList());
|
|
model.addAttribute("scorePolicyList", ScorePolicy.getList());
|
|
- model.addAttribute("arbitrateTypeList", ArbitrateType.values());
|
|
|
|
|
|
+ ArbitrateType[] arbitrateTypeList = { ArbitrateType.QUESTION, ArbitrateType.GROUP };
|
|
|
|
+ model.addAttribute("arbitrateTypeList",arbitrateTypeList );
|
|
model.addAttribute("thirdPolicyList", ThirdPolicy.values());
|
|
model.addAttribute("thirdPolicyList", ThirdPolicy.values());
|
|
model.addAttribute("exam", examService.findById(examId));
|
|
model.addAttribute("exam", examService.findById(examId));
|
|
List<ExamQuestion> questions = questionService.findByExamAndSubjectAndObjective(examId, subjectCode, false);
|
|
List<ExamQuestion> questions = questionService.findByExamAndSubjectAndObjective(examId, subjectCode, false);
|