同步工具双评控制

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ExamController.java

@@ -96,8 +96,8 @@ public class ExamController extends BaseApiController {
         JSONObject result = new JSONObject();
         result.accumulate("id", examId);
         result.accumulate("name", exam.getName());
-        School shcool = schoolService.findById(au.getSchoolId());
-        result.accumulate("schoolName", shcool.getName());
+        School school = schoolService.findById(au.getSchoolId());
+        result.accumulate("schoolName", school.getName());
         result.accumulate("config", StringUtils.trimToEmpty(exam.getScanConfig()));
         result.accumulate("updateTime", System.currentTimeMillis());
         return result;

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/LoginController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import cn.com.qmth.stmms.api.exception.ApiException;
+import cn.com.qmth.stmms.biz.config.service.impl.SystemCache;
 import cn.com.qmth.stmms.biz.exam.service.SubjectUserService;
 import cn.com.qmth.stmms.biz.file.service.FileService;
 import cn.com.qmth.stmms.biz.school.model.School;
@@ -47,6 +48,9 @@ public class LoginController extends BaseApiController {
     @Autowired
     private FileService fileService;
 
+    @Autowired
+    private SystemCache systemCache;
+
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SCANNER, Role.SUBJECT_HEADER, Role.COLLEGE_ADMIN })
     @RequestMapping(value = "/user/login", method = RequestMethod.GET)
     @ResponseBody
@@ -59,6 +63,8 @@ public class LoginController extends BaseApiController {
         obj.accumulate("campusId", 0);
         obj.accumulate("schoolId", user.getSchoolId());
         obj.accumulate("fileServer", fileService.getFileServer());
+        School school = schoolService.findById(user.getSchoolId());
+        obj.accumulate("doubleTrack", systemCache.isDoubleTrack() && school.isDoubleTrack());
         JSONArray array = new JSONArray();
         if (user.getUserData() != null && Role.SUBJECT_HEADER.equals(user.getRole())) {
             Set<String> set = subjectUserService.findSubjectCode(user.getUserData().getId());
@@ -95,8 +101,8 @@ public class LoginController extends BaseApiController {
         obj.accumulate("name", user.getName());
         obj.accumulate("role", user.getRole().toString());
         obj.accumulate("schoolId", user.getSchoolId());
-        School shcool = schoolService.findById(user.getSchoolId());
-        obj.accumulate("schoolName", shcool.getName());
+        School school = schoolService.findById(user.getSchoolId());
+        obj.accumulate("schoolName", school.getName());
         obj.accumulate("token", user.getScanToken());
         obj.accumulate("fileServer", fileService.getFileServer());
         return obj;

stmms-web/src/main/webapp/sql/upgrade/1.3.14.sql

@@ -12,7 +12,7 @@ ALTER TABLE eb_exam_subject ADD COLUMN `inspect_round` 	int(11) NOT NULL DEFAULT
 ALTER TABLE eb_inspect_history ADD COLUMN `inspect_round` 	int(11) NOT NULL COMMENT '复核轮数';
 ALTER TABLE eb_exam_subject ADD COLUMN `selective` 	tinyint(1) NOT NULL DEFAULT 0 COMMENT '选做题科目';
 
-ALTER TABLE b_school ADD COLUMN double_track`  tinyint(1)  NOT NULL DEFAULT 0 COMMENT '双评轨迹';
+ALTER TABLE b_school ADD COLUMN `double_track`  tinyint(1)  NOT NULL DEFAULT 0 COMMENT '双评轨迹';
 
 -- 更新选做题科目数据
 UPDATE eb_exam_subject o,