fix bugs

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

@@ -122,18 +122,20 @@ public class ArbitrateController extends BaseExamController {
         }
         List<MarkGroup> groupList = groupService.findByExamAndSubjectWithDouble(query.getExamId(),
                 query.getSubjectCode());
-        if (query.getGroupNumber() == null && groupList.size() > 0) {
-            query.setGroupNumber(groupList.get(0).getNumber());
-        }
-        for (MarkGroup group : groupList) {
-            group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(query.getExamId(),
-                    group.getSubjectCode(), false, group.getNumber()));
-        }
-        query.orderByIdDesc();
-        query = arbitrateService.findByQuery(query);
-        for (ArbitrateHistory history : query.getResult()) {
-            if (history.getUserId() != null) {
-                history.setUser(userService.findById(history.getUserId()));
+        if (!groupList.isEmpty()) {
+            for (MarkGroup group : groupList) {
+                group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(query.getExamId(),
+                        group.getSubjectCode(), false, group.getNumber()));
+            }
+            if (query.getGroupNumber() == null && groupList.size() > 0) {
+                query.setGroupNumber(groupList.get(0).getNumber());
+            }
+            query.orderByIdDesc();
+            query = arbitrateService.findByQuery(query);
+            for (ArbitrateHistory history : query.getResult()) {
+                if (history.getUserId() != null) {
+                    history.setUser(userService.findById(history.getUserId()));
+                }
             }
         }
         model.addAttribute("query", query);

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

@@ -33,14 +33,14 @@ public class MarkInterceptor extends SessionInterceptor {
             if (wu.getUser().getLastLoginTime() == null && request.getServletPath().startsWith("/mark/reset")) {
                 // 首次登录，强制重置密码及姓名
                 return true;
-            } else if (wu.getMarkerId() == null && !request.getServletPath().startsWith("/mark/subject")) {
+            } else if ((wu.getMarkerId() == null ||wu.getMarker() == null)&& !request.getServletPath().startsWith("/mark/subject")) {
                 // 通用帐号未选择科目，首先选择强制选择评卷科目
                 return redirect(request, response, "/mark/subject-select");
             } else if (request.getServletPath().startsWith("/mark/logout")) {
                 return true;
-            } else if (wu.getMarkerId() != null && wu.getMarker() == null) {
+            } else if (wu.getMarkerId() != null&& wu.getMarker() == null) {
                 // 用户存在但评卷员解绑
-                return sessionExpireAjax(request, response, "/mark-login");
+                return sessionExpire(request, response, "/mark-login");
             } else if (request.getServletPath().startsWith("/mark/logout")) {
                 return true;
             }

stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -151,8 +151,12 @@ CREATE TABLE `eb_exam`
     `slice_config`      text         DEFAULT NULL COMMENT '裁切图坐标',
     `description`       varchar(128) DEFAULT NULL COMMENT '描述',
     `creator_id`        int(11)      DEFAULT NULL COMMENT '创建人',
-    `create_time`       datetime    NOT NULL COMMENT '创建时间',
+    `create_time`       datetime     NOT NULL COMMENT '创建时间',
     `update_time`       datetime     DEFAULT NULL COMMENT '修改时间',
+    `mark_start_time`   datetime     DEFAULT NULL COMMENT '考试开始时间',
+    `mark_end_time`     datetime     DEFAULT NULL COMMENT '考试结束时间',
+	`sheet_view`		tinyint(1)   NOT NULL COMMENT '原卷显示功能',
+    `mark_mode`       	varchar(16)  DEFAULT NULL COMMENT '强制评卷模式',
     PRIMARY KEY (`id`),
     UNIQUE KEY `index1` (`school_id`, `code`)
 ) ENGINE = InnoDB
@@ -188,7 +192,7 @@ CREATE TABLE `eb_exam_question`
     `subject_code`     varchar(32) NOT NULL DEFAULT '' COMMENT '科目代码',
     `paper_type`       varchar(8)  NOT NULL COMMENT '试卷类型',
     `is_objective`     tinyint(1)  NOT NULL COMMENT '是否客观题',
-    `group_number`     int(11)     NOT NULL COMMENT '分组序号',
+    `group_number`     int(11)     DEFAULT NULL COMMENT '分组序号',
     `main_number`      int(11)     NOT NULL COMMENT '大题号',
     `sub_number`       varchar(32) NOT NULL COMMENT '小题号',
     `main_title`       varchar(32) NOT NULL COMMENT '大题名称',