考试切换回退到初始模式，不在各个功能页面增加考试选择条件

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

@@ -84,22 +84,14 @@ public class ArbitrateController extends BaseExamController {
 
     @RequestMapping
     public String list(Model model, HttpServletRequest request, ArbitrateHistorySearchQuery query) {
+        int examId = getSessionExamId(request);
         WebUser wu = RequestUtils.getWebUser(request);
-        List<Exam> examList = getExamList(wu);
-        if (examList.isEmpty()) {
-            return "redirect:/admin/exam/mark";
-        }
-        if (query.getExamId() == null) {
-            query.setExamId(getSessionExamId(request));
-        }
-        if (query.getExamId() == null) {
-            query.setExamId(examList.get(0).getId());
-        }
-        List<ExamSubject> subjectList = getExamSubject(query.getExamId(), wu);
+        List<ExamSubject> subjectList = getExamSubject(examId, wu);
         if (subjectList.isEmpty()) {
             return "redirect:/admin/exam/mark";
         }
-        if (query.getSubjectCode() == null) {
+        query.setExamId(examId);
+        if (query.getSubjectCode() == null && !subjectList.isEmpty()) {
             query.setSubjectCode(subjectList.get(0).getCode());
         }
         List<MarkGroup> groupList = groupService
@@ -120,7 +112,6 @@ public class ArbitrateController extends BaseExamController {
             }
         }
         model.addAttribute("query", query);
-        model.addAttribute("examList", examList);
         model.addAttribute("subjectList", subjectList);
         model.addAttribute("groupList", groupList);
         model.addAttribute("statusList", HistoryStatus.getOptionList());

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

@@ -35,18 +35,6 @@ public class BaseExamController extends BaseController {
         return SessionExamUtils.getExamId(request);
     }
 
-    protected void setSessionExamId(HttpServletRequest request, Integer examId) {
-        SessionExamUtils.setExamId(request, examId);
-    }
-
-    protected Integer getQueryExamId(HttpServletRequest request, List<Exam> examList) {
-        Integer examId = getSessionExamId(request);
-        if (examId == null && !examList.isEmpty()) {
-            examId = examList.get(0).getId();
-        }
-        return examId;
-    }
-
     /**
      * 添加Flash消息
      *
@@ -68,7 +56,7 @@ public class BaseExamController extends BaseController {
         return examService.findBySchoolIdAndStatus(wu.getUser().getSchoolId());
     }
 
-    protected List<ExamSubject> getExamSubject(int examId, WebUser wu) {
+    protected List<ExamSubject> getExamSubject(Integer examId, WebUser wu) {
         List<ExamSubject> list = new LinkedList<ExamSubject>();
         if (wu.isSchoolAdmin() || wu.isSchoolViewer()) {
             list = subjectService.list(examId);
@@ -87,16 +75,15 @@ public class BaseExamController extends BaseController {
     }
 
     protected String buildPictureConfig(String sheetConfig) {
-        String json = "";
         if (StringUtils.isNotBlank(sheetConfig)) {
             try {
                 ObjectMapper mapper = new ObjectMapper();
-                json = mapper.writeValueAsString(PictureConfigItem.parse(sheetConfig));
+                return mapper.writeValueAsString(PictureConfigItem.parse(sheetConfig));
             } catch (JsonProcessingException e) {
                 e.printStackTrace();
             }
         }
-        return json;
+        return "";
     }
 
 }

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

@@ -17,7 +17,6 @@ import cn.com.qmth.stmms.biz.mark.service.MarkService;
 import cn.com.qmth.stmms.common.annotation.Logging;
 import cn.com.qmth.stmms.common.annotation.RoleRequire;
 import cn.com.qmth.stmms.common.domain.WebUser;
-import cn.com.qmth.stmms.common.enums.ExamStatus;
 import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
@@ -79,138 +78,135 @@ public class StudentController extends BaseExamController {
 
     @Logging(menu = "查询考生", type = LogType.QUERY)
     @RequestMapping
-    public String query(Model model, HttpServletRequest request, ExamStudentSearchQuery query) {
+    public String list(Model model, HttpServletRequest request, ExamStudentSearchQuery query) {
         WebUser wu = RequestUtils.getWebUser(request);
-        List<Exam> examList = getExamList(wu);
-        if (query.getExamId() == null) {
-            query.setExamId(getQueryExamId(request, examList));
+        int examId = getSessionExamId(request);
+        query.setExamId(examId);
+        if (query.getBatchCode() != null) {
+            query.setBatchCode(StringUtils.upperCase(query.getBatchCode()));
         }
-        if (query.getExamId() != null) {
-            setSessionExamId(request, query.getExamId());
-
-            if (query.getBatchCode() != null) {
-                query.setBatchCode(StringUtils.upperCase(query.getBatchCode()));
-            }
-            query = studentService.findByQuery(query);
-            if (query.getCurrentCount() > 0) {
-                for (ExamStudent student : query.getResult()) {
-                    student.setSubject(subjectService.find(student.getExamId(), student.getSubjectCode()));
-                    buildSheetUrl(student);
-                    buildPackageUrl(student);
-                }
-                model.addAttribute("studentList", query.getResult());
+        query = studentService.findByQuery(query);
+        if (query.getCurrentCount() > 0) {
+            for (ExamStudent student : query.getResult()) {
+                student.setSubject(subjectService.find(student.getExamId(), student.getSubjectCode()));
+                buildSheetUrl(student);
+                buildPackageUrl(student);
             }
-            model.addAttribute("campusList", studentService.findDistinctCampusName(query.getExamId()));
-            model.addAttribute("subjectList", getExamSubject(query.getExamId(), wu));
-            model.addAttribute("levelList", subjectService.listLevel(query.getExamId()));
-            model.addAttribute("categoryList", subjectService.listCategory(query.getExamId()));
-            Exam exam = examService.findById(query.getExamId());
-            model.addAttribute("examType", exam.getType());
+            model.addAttribute("studentList", query.getResult());
         }
         model.addAttribute("query", query);
-        model.addAttribute("examList", examList);
+        model.addAttribute("campusList", studentService.findDistinctCampusName(examId));
+        model.addAttribute("subjectList", getExamSubject(examId, wu));
+        model.addAttribute("levelList", subjectService.listLevel(examId));
+        model.addAttribute("categoryList", subjectService.listCategory(examId));
         model.addAttribute("imageServer", imageServer);
         model.addAttribute("packageServer", packageServer);
+        Exam exam = examService.findById(examId);
+        model.addAttribute("examType", exam.getType());
         return "modules/exam/studentList";
     }
 
     @RequestMapping(value = "/add")
     @RoleRequire(Role.SCHOOL_ADMIN)
-    public String add(HttpServletRequest request, ExamStudent student, Model model) {
-        WebUser wu = RequestUtils.getWebUser(request);
+    public String form(HttpServletRequest request, ExamStudent student, Model model) {
+        Exam exam = examService.findById(getSessionExamId(request));
         model.addAttribute("student", student);
-        model.addAttribute("examList", getExamList(wu));
-        return "modules/exam/studentAdd";
-    }
-
-    @Logging(menu = "新增考生", type = LogType.ADD)
-    @RequestMapping(value = "/insert")
-    @RoleRequire(Role.SCHOOL_ADMIN)
-    public String insert(ExamStudent student, RedirectAttributes redirectAttributes, HttpServletRequest request) {
-        WebUser wu = RequestUtils.getWebUser(request);
-        Exam exam = student.getExamId() != null ? examService.findById(student.getExamId()) : null;
-        ExamSubject subject = exam != null ? subjectService.find(exam.getId(), student.getSubjectCode()) : null;
-        if (exam == null) {
-            addMessage(redirectAttributes, "考试不存在");
-        } else if (exam.getStatus() != ExamStatus.START || !exam.getSchoolId().equals(wu.getUser().getSchoolId())) {
-            addMessage(redirectAttributes, "考试不可操作");
-        } else if (subject == null) {
-            addMessage(redirectAttributes, "科目不存在");
-        } else {
-            student.setSchoolId(exam.getSchoolId());
-            student.setSubjectName(subject.getName());
-            student.setAbsent(false);
-            student.setUpload(false);
-            student.setException(false);
-            student.setSliceCount(0);
-            student.setSheetCount(0);
-            student.setObjectiveScore(0d);
-            student.setSubjectiveScore(0d);
-            if (studentService.findByExamIdAndExamNumber(student.getExamId(), student.getExamNumber()) != null) {
-                redirectAttributes.addAttribute("student", student);
-                addMessage(redirectAttributes, "准考证号" + student.getExamNumber() + "已经存在");
-                return "redirect:/admin/exam/student/add";
-            } else {
-                studentService.save(student);
-                addMessage(redirectAttributes, "考生" + student.getExamNumber() + "添加成功");
-            }
-        }
-        return "redirect:/admin/exam/student";
+        model.addAttribute("subjectList", getExamSubject(exam.getId(), RequestUtils.getWebUser(request)));
+        model.addAttribute("campusList", studentService.findDistinctCampusName(exam.getId()));
+        return "modules/exam/studentForm";
     }
 
     @RequestMapping(value = "/update")
     @RoleRequire(Role.SCHOOL_ADMIN)
     public String update(HttpServletRequest request, Integer id, Model model) {
-        WebUser wu = RequestUtils.getWebUser(request);
+        Exam exam = examService.findById(getSessionExamId(request));
         ExamStudent student = studentService.findById(id);
-        Exam exam = student != null ? examService.findById(student.getExamId()) : null;
-        if (exam != null && exam.getStatus() == ExamStatus.START) {
-            model.addAttribute("student", student);
-            model.addAttribute("subjectList", getExamSubject(exam.getId(), wu));
-            return "modules/exam/studentEdit";
-        } else {
-            return "redirect:/admin/exam/student";
-        }
+        model.addAttribute("student", student);
+        model.addAttribute("subjectList", getExamSubject(exam.getId(), RequestUtils.getWebUser(request)));
+        model.addAttribute("campusList", studentService.findDistinctCampusName(exam.getId()));
+        return "modules/exam/studentForm";
     }
 
-    @Logging(menu = "修改考生", type = LogType.UPDATE)
+    @Logging(menu = "新增（修改）考生", type = LogType.UPDATE)
     @RequestMapping(value = "/save")
     @RoleRequire(Role.SCHOOL_ADMIN)
     public String save(ExamStudent student, Model model, RedirectAttributes redirectAttributes,
             HttpServletRequest request, HttpServletResponse response) {
-        WebUser wu = RequestUtils.getWebUser(request);
-        Exam exam = student.getExamId() != null ? examService.findById(student.getExamId()) : null;
-        ExamSubject subject = exam != null ? subjectService.find(exam.getId(), student.getSubjectCode()) : null;
-        if (exam == null) {
-            addMessage(redirectAttributes, "考试不存在");
-        } else if (exam.getStatus() != ExamStatus.START || !exam.getSchoolId().equals(wu.getUser().getSchoolId())) {
-            addMessage(redirectAttributes, "考试不可操作");
-        } else if (subject == null) {
+        int examId = getSessionExamId(request);
+        Exam exam = examService.findById(examId);
+        ExamSubject subject = subjectService.find(examId, student.getSubjectCode());
+        Campus campus = campusService.findBySchoolAndName(exam.getSchoolId(), student.getCampusName());
+        if (subject == null) {
             addMessage(redirectAttributes, "科目不存在");
+        } else if (campus == null) {
+            addMessage(redirectAttributes, "学习中心不存在");
         } else {
-            ExamStudent previous = studentService.findById(student.getId());
-            if (previous != null) {
-                if (studentService.findByExamIdAndExamNumber(exam.getId(), student.getExamNumber()) != null) {
-                    addMessage(redirectAttributes, "准考证号" + student.getExamNumber() + "已经存在");
-                    return "redirect:/admin/exam/student/update?id=" + student.getId();
-                }
-                if (!previous.isUpload()) {
-                    // 还未扫描上传的考生，才能修改准考证号、学习中心、科目
-                    previous.setSubjectCode(subject.getCode());
-                    previous.setSubjectName(subject.getName());
-                    previous.setExamNumber(student.getExamNumber());
-                    previous.setCampusName(student.getCampusName());
+            if (student.getId() != null) {
+                ExamStudent previous = studentService.findById(student.getId());
+                if (previous != null) {
+                    // String previousSubjectCode = previous.getSubjectCode();
+                    student.setExamId(examId);
+                    ExamStudent old = checkExamNumber(student, new HashMap<String, ExamStudent>(),
+                            new HashMap<String, ExamStudent>());
+                    if (old != null && !old.getExamNumber().equals(previous.getExamNumber())) {
+                        addMessage(redirectAttributes, "准考证号" + student.getExamNumber() + "已经存在");
+                        return "redirect:/admin/exam/student";
+                    }
+                    if (!previous.isUpload()) {
+                        // 还未扫描上传的考生，才能修改准考证号、学习中心、科目
+                        previous.setCampusName(student.getCampusName());
+                        previous.setSubjectCode(subject.getCode());
+                        previous.setSubjectName(subject.getName());
+                        previous.setExamNumber(student.getExamNumber());
+                    }
+                    previous.setStudentCode(student.getStudentCode());
+                    previous.setName(student.getName());
+                    previous.setPackageCode(student.getPackageCode());
+                    previous.setCollege(student.getCollege());
+                    previous.setClassName(student.getClassName());
+                    previous.setTeacher(student.getTeacher());
+                    previous = studentService.save(previous);
+                    // if
+                    // (!previousSubjectCode.equals(previous.getSubjectCode()))
+                    // {
+                    // // 更新科目上传考生数量
+                    // subjectService.updateUploadCount(examId,
+                    // previousSubjectCode);
+                    // subjectService.updateUploadCount(examId,
+                    // previous.getSubjectCode());
+                    // // 删除已生成的评卷任务
+                    // libraryService.deleteByStudent(previous.getId());
+                    // // 更新科目大题任务数量
+                    // groupService.updateLibraryCount(examId,
+                    // previousSubjectCode);
+                    // // 重置科目所有大题构造评卷任务时间
+                    // groupService.resetBuildTime(examId,
+                    // previous.getSubjectCode());
+                    // }
+                    addMessage(redirectAttributes, "考生" + previous.getName() + "保存成功");
+                } else {
+                    addMessage(redirectAttributes, "考生不存在");
                 }
-                previous.setStudentCode(student.getStudentCode());
-                previous.setName(student.getName());
-                previous.setPackageCode(student.getPackageCode());
-                previous.setCollege(student.getCollege());
-                previous.setClassName(student.getClassName());
-                previous.setTeacher(student.getTeacher());
-                previous = studentService.save(previous);
-                addMessage(redirectAttributes, "考生" + previous.getExamNumber() + "保存成功");
             } else {
-                addMessage(redirectAttributes, "考生不存在");
+                student.setExamId(examId);
+                student.setSchoolId(exam.getSchoolId());
+                student.setSubjectName(subject.getName());
+                student.setAbsent(false);
+                student.setUpload(false);
+                student.setException(false);
+                student.setSliceCount(0);
+                student.setSheetCount(0);
+                student.setObjectiveScore(0d);
+                student.setSubjectiveScore(0d);
+                ExamStudent old = checkExamNumber(student, new HashMap<String, ExamStudent>(),
+                        new HashMap<String, ExamStudent>());
+                if (old != null) {
+                    addMessage(redirectAttributes, "准考证号" + student.getExamNumber() + "已经存在");
+                    return "redirect:/admin/exam/student";
+                } else {
+                    studentService.save(student);
+                }
+                addMessage(redirectAttributes, "考生" + student.getName() + "保存成功");
             }
         }
         return "redirect:/admin/exam/student";
@@ -251,15 +247,9 @@ public class StudentController extends BaseExamController {
     @Logging(menu = "导入考生", type = LogType.IMPORT_FILE)
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @RoleRequire(Role.SCHOOL_ADMIN)
-    public String importFile(HttpServletRequest request, @RequestParam Integer examId, MultipartFile file,
-            RedirectAttributes redirectAttributes) {
-        WebUser wu = RequestUtils.getWebUser(request);
+    public String importFile(HttpServletRequest request, MultipartFile file, RedirectAttributes redirectAttributes) {
+        int examId = getSessionExamId(request);
         Exam exam = examService.findById(examId);
-        if (exam == null || exam.getStatus() != ExamStatus.START || !exam.getSchoolId()
-                .equals(wu.getUser().getSchoolId())) {
-            addMessage(redirectAttributes, "考试不存在或不可操作");
-            return "redirect:/admin/exam/student";
-        }
         try {
             int successNum = 0;
             int failureNum = 0;
@@ -286,6 +276,7 @@ public class StudentController extends BaseExamController {
                         || StringUtils.isBlank(student.getTeacher()) || StringUtils.isBlank(student.getStudentCode())) {
                     continue;
                 }
+
                 student.setExamId(examId);
                 student.setSchoolId(exam.getSchoolId());
                 student.setAbsent(false);
@@ -322,9 +313,12 @@ public class StudentController extends BaseExamController {
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     public String exportFile(ExamStudentSearchQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
+        WebUser wu = RequestUtils.getWebUser(request);
+        int examId = getSessionExamId(request);
         try {
             query.setPageNumber(1);
             query.setPageSize(Integer.MAX_VALUE);
+            query.setExamId(examId);
             query.orderByExamNumber();
             query = studentService.findByQuery(query);
             for (ExamStudent student : query.getResult()) {
@@ -371,15 +365,9 @@ public class StudentController extends BaseExamController {
 
     @Logging(menu = "导入缺考名单", type = LogType.IMPORT_FILE)
     @RequestMapping(value = "/absentImport", method = RequestMethod.POST)
-    public String absentImportFile(HttpServletRequest request, @RequestParam Integer examId, MultipartFile file,
+    public String absentImportFile(HttpServletRequest request, MultipartFile file,
             RedirectAttributes redirectAttributes) {
-        WebUser wu = RequestUtils.getWebUser(request);
-        Exam exam = examService.findById(examId);
-        if (exam == null || exam.getStatus() != ExamStatus.START || !exam.getSchoolId()
-                .equals(wu.getUser().getSchoolId())) {
-            addMessage(redirectAttributes, "考试不存在或不可操作");
-            return "redirect:/admin/exam/student";
-        }
+        int examId = getSessionExamId(request);
         try {
             int successNum = 0;
             int failureNum = 0;
@@ -430,15 +418,10 @@ public class StudentController extends BaseExamController {
 
     @Logging(menu = "导入违纪名单", type = LogType.IMPORT_FILE)
     @RequestMapping(value = "/breachImport", method = RequestMethod.POST)
-    public String breachImportFile(HttpServletRequest request, @RequestParam Integer examId, MultipartFile file,
+    public String breachImportFile(HttpServletRequest request, MultipartFile file,
             RedirectAttributes redirectAttributes) {
-        WebUser wu = RequestUtils.getWebUser(request);
-        Exam exam = examService.findById(examId);
-        if (exam == null || exam.getStatus() != ExamStatus.START || !exam.getSchoolId()
-                .equals(wu.getUser().getSchoolId())) {
-            addMessage(redirectAttributes, "考试不存在或不可操作");
-            return "redirect:/admin/exam/student";
-        }
+        int examId = getSessionExamId(request);
+        // Exam exam = examService.findById(examId);
         try {
             int successNum = 0;
             int failureNum = 0;
@@ -478,16 +461,18 @@ public class StudentController extends BaseExamController {
     }
 
     @Logging(menu = "违纪重置", type = LogType.UPDATE)
-    @RoleRequire(Role.SCHOOL_ADMIN)
     @RequestMapping(value = "/updateBreach", method = RequestMethod.POST)
     @ResponseBody
     public JSONObject updateBreach(HttpServletRequest request, Integer id) {
         JSONObject result = new JSONObject();
-        if (studentService.updateBreach(id, false)) {
+        ExamStudent student = studentService.findById(id);
+        student.setBreach(false);
+        student = studentService.save(student);
+        if (student != null) {
             result.accumulate("message", "重置成功！");
             result.accumulate("success", true);
         } else {
-            result.accumulate("message", "重置失败！");
+            result.accumulate("message", "将违纪考生信息重置为正常时出错!");
             result.accumulate("success", false);
         }
         return result;
@@ -508,15 +493,10 @@ public class StudentController extends BaseExamController {
     }
 
     @RequestMapping(value = "/uploadImport", method = RequestMethod.POST)
-    public String uploadImportFile(HttpServletRequest request, @RequestParam Integer examId, MultipartFile file,
+    public String uploadImportFile(HttpServletRequest request, MultipartFile file,
             RedirectAttributes redirectAttributes) {
-        WebUser wu = RequestUtils.getWebUser(request);
-        Exam exam = examService.findById(examId);
-        if (exam == null || exam.getStatus() != ExamStatus.START || !exam.getSchoolId()
-                .equals(wu.getUser().getSchoolId())) {
-            addMessage(redirectAttributes, "考试不存在或不可操作");
-            return "redirect:/admin/exam/student";
-        }
+        int examId = getSessionExamId(request);
+        // Exam exam = examService.findById(examId);
         try {
             int successNum = 0;
             int failureNum = 0;

stmms-web/src/main/java/cn/com/qmth/stmms/admin/utils/SessionExamUtils.java

@@ -9,14 +9,14 @@ public class SessionExamUtils {
 
     public static final String EXAM_ID_KEY = "examId";
 
-    public static Integer getExamId(HttpServletRequest request) {
-        Integer examId = null;
+    public static int getExamId(HttpServletRequest request) {
+        int examId = 0;
         try {
             examId = Integer.valueOf(RequestUtils.getSession(request).getParameter(EXAM_ID_KEY));
         } catch (Exception e) {
             // log.error("考试-基础参数设置-examId类型转换出错", e);
         }
-        if (examId == null) {
+        if (examId == 0) {
             try {
                 examId = Integer.valueOf(request.getParameter(EXAM_ID_KEY));
             } catch (Exception e) {

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

@@ -1,113 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
-<html>
-<head>
-    <title>考生添加</title>
-    <meta name="decorator" content="default"/>
-    <%@include file="/WEB-INF/views/include/head.jsp" %>
-</head>
-<body>
-<form:form id="inputForm" modelAttribute="student" action="${ctx}/admin/exam/student/insert" method="post" class="form-horizontal">
-    <tags:message content="${message}"/>
-    <div class="control-group">
-        <label class="control-label">考试</label>
-        <div class="controls">
-            <form:select idd="examSelect" path="examId" class="required">
-                <c:forEach items="${examList }" var="exam">
-                    <option value="${exam.id }">${exam.id}-${exam.name}</option>
-                </c:forEach>
-            </form:select>
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">科目</label>
-        <div class="controls">
-            <form:select id="subjectCodeSelect" path="subjectCode" class="required">
-            </form:select>
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">姓名</label>
-        <div class="controls">
-            <form:input path="name" htmlEscape="false" maxlength="32" class="required"/>
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">学号</label>
-        <div class="controls">
-            <form:input path="studentCode" htmlEscape="false" maxlength="32" class="required"/>
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">准考证号</label>
-        <div class="controls">
-            <form:input path="examNumber" htmlEscape="false" maxlength="32" class="required"/>
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">学院</label>
-        <div class="controls">
-            <form:input path="college" htmlEscape="false" maxlength="32" class="required"/>
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">班级</label>
-        <div class="controls">
-            <form:input path="className" htmlEscape="false" maxlength="32" class="required"/>
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">任课老师</label>
-        <div class="controls">
-            <form:input path="teacher" htmlEscape="false" maxlength="32" class="required"/>
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">签到表编号</label>
-        <div class="controls">
-            <form:input path="packageCode" htmlEscape="false" maxlength="32" class=""/>
-        </div>
-    </div>
-    <div class="form-actions">
-        <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
-        <a href="${ctx}/admin/exam/student" class="btn">返回</a>
-    </div>
-</form:form>
-<script type="text/javascript">
-    $(document).ready(function () {
-        //$("#name").focus();
-        $("#inputForm").validate({
-
-            submitHandler: function (form) {
-                //alert("studentId="+$("#studentId").val()+" subjectCode="+$("#subjectCode").val());
-                //$("#subjectCode").removeAttr("disabled");
-                loading('正在提交，请稍等...');
-                form.submit();
-            },
-            errorContainer: "#messageBox",
-            errorPlacement: function (error, element) {
-                $("#messageBox").text("输入有误，请先更正。");
-                if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
-                    error.appendTo(element.parent().parent());
-                } else {
-                    error.insertAfter(element);
-                }
-            }
-        });
-        $('#examSelect').change(function () {
-            let examId = $('#examSelect').val();
-            $.post('${ctx}/admin/exam/subject/list', {examId: examId}, function (list) {
-                $('#subjectCodeSelect').empty();
-                for (let i = 0; i < list.length; i++) {
-                    let item = list.get(i);
-                    $('#subjectCodeSelect').append('<option value="' + item.code + '">'
-                        + item.code + '-' + item.name + '</option>');
-                }
-                $('#subjectCodeSelect').trigger('change');
-            });
-        })
-        $('#examSelect').trigger('change');
-    });
-</script>
-</body>
-</html>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/studentEdit.jsp → stmms-web/src/main/webapp/WEB-INF/views/modules/exam/studentForm.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-    <title>考生修改</title>
+    <title>考试管理</title>
     <meta name="decorator" content="default"/>
     <%@include file="/WEB-INF/views/include/head.jsp" %>
 </head>
@@ -103,4 +103,4 @@
     });
 </script>
 </body>
-</html>
+</html>

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

@@ -14,11 +14,6 @@
 <div id="importBox" class="hide">
     <form id="importForm" action="${ctx}/admin/exam/student/import" method="post" enctype="multipart/form-data"
           style="padding-left:20px;text-align:center;" class="form-search" onsubmit="loading('正在导入，请稍等...');"><br/>
-        <select class="input-large" name="examId">
-            <c:forEach items="${examList }" var="exam">
-                <option value="${exam.id }">${exam.id}-${exam.name}</option>
-            </c:forEach>
-        </select>
         <input id="uploadFile" name="file" type="file" style="width:330px"/><br/><br/>　　
         <input id="btnImportSubmit" class="btn btn-primary" type="submit" value="   导    入   "/>
         <a href="${ctx}/admin/exam/student/template">下载模板</a>
@@ -27,11 +22,6 @@
 <div id="breachImportBox" class="hide">
     <form id="breachImportForm" action="${ctx}/admin/exam/student/breachImport" method="post" enctype="multipart/form-data"
           style="padding-left:20px;text-align:center;" class="form-search" onsubmit="loading('正在导入，请稍等...');"><br/>
-        <select class="input-large" name="examId">
-            <c:forEach items="${examList }" var="exam">
-                <option value="${exam.id }">${exam.id}-${exam.name}</option>
-            </c:forEach>
-        </select>
         <input id="breachUploadFile" name="file" type="file" style="width:330px"/><br/><br/>　　
         <input id="breachBtnImportSubmit" class="btn btn-primary" type="submit" value="违纪考生导入"/>
         <a href="${ctx}/admin/exam/student/breachTemplate">下载模板</a>
@@ -40,11 +30,6 @@
 <div id="absentImportBox" class="hide">
     <form id="absentImportForm" action="${ctx}/admin/exam/student/absentImport" method="post" enctype="multipart/form-data"
           style="padding-left:20px;text-align:center;" class="form-search" onsubmit="loading('正在导入，请稍等...');"><br/>
-        <select class="input-large" name="examId">
-            <c:forEach items="${examList }" var="exam">
-                <option value="${exam.id }">${exam.id}-${exam.name}</option>
-            </c:forEach>
-        </select>
         <input id="absentUploadFile" name="file" type="file" style="width:330px"/><br/><br/>　　
         <input id="absentBtnImportSubmit" class="btn btn-primary" type="submit" value="缺考考生导入"/>
         <a href="${ctx}/admin/exam/student/absentTemplate">下载模板</a>
@@ -53,11 +38,6 @@
 <div id="uploadImportBox" class="hide">
     <form id="uploadImportForm" action="${ctx}/admin/exam/student/uploadImport" method="post" enctype="multipart/form-data"
           style="padding-left:20px;text-align:center;" class="form-search" onsubmit="loading('正在导入，请稍等...');"><br/>
-        <select class="input-large" name="examId">
-            <c:forEach items="${examList }" var="exam">
-                <option value="${exam.id }">${exam.id}-${exam.name}</option>
-            </c:forEach>
-        </select>
         <input id="studentUploadFile" name="file" type="file" style="width:330px"/><br/><br/>　　
         <input id="uploadBtnImportSubmit" class="btn btn-primary" type="submit" value="多媒体考生上传导入"/>
         <a href="${ctx}/admin/exam/student/uploadTemplate">下载模板</a>
@@ -67,12 +47,6 @@
     <input type="hidden" id="pageNumber" name="pageNumber" value="${query.pageNumber }"/>
     <input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize}"/>
     <div>
-        <label>考试</label>
-        <select class="input-large" id="examId" name="examId">
-            <c:forEach items="${examList }" var="exam">
-                <option value="${exam.id }" <c:if test="${query.examId eq exam.id }">selected</c:if>>${exam.id}-${exam.name}</option>
-            </c:forEach>
-        </select>
         <label>姓名</label>
         <input type="text" name="name" value="${query.name}" maxlength="10" class="input-mini"/>
         <label>准考证号</label>
@@ -141,7 +115,7 @@
                 <ul class="dropdown-menu">
                     <li><a href="##" id="breachBtnImport">违纪名单</a></li>
                     <li><a href="##" id="absentBtnImport">缺考名单</a></li>
-                    <!-- <li><a href="##" id="uploadBtnImport">多媒体上传名单</a></li> -->
+                    <!--                             <li><a href="##" id="uploadBtnImport">多媒体上传名单</a></li> -->
                 </ul>
                 </div>
             </c:if>
@@ -162,11 +136,11 @@
         <th>试卷类型</th>
         <th>层次</th>
         <th>专业类型</th>
-        <th>扫描状态</th>
+        <th>扫描识别</th>
         <th>人工指定</th>
-        <th>扫描批次</th>
+        <th>批次编号</th>
         <th>签到表编号</th>
-        <th>考点考场</th>
+        <th>考试备注信息</th>
         <th>操作</th>
     </tr>
     </thead>