修复阅卷轨迹未保存；修复成绩查询考生编号400；修复登录乱码问题；

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

@@ -29,7 +29,7 @@ import cn.com.qmth.stmms.common.utils.Md5EncryptUtils;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 @Controller
-public class LoginController {
+public class LoginController extends BaseController{
 
     protected static final String AP_INDEX_VIEW = "modules/sys/indexAp";
 
@@ -116,37 +116,6 @@ public class LoginController {
         return view;
     }
 
-    /**
-     * 科组长、评卷员登录
-     * 
-     * @param request
-     * @param loginType
-     * @param examId
-     * @param code
-     * @param password
-     * @return
-     */
-    @RequestMapping(value = "/mark-login", method = RequestMethod.POST)
-    public ModelAndView login(HttpServletRequest request, @RequestParam String loginName, @RequestParam String password) {
-        Marker marker = markerService.findByLoginName(loginName);
-        if (marker != null) {
-            return markerLogin(request, marker, password);
-        }
-        // SubjectHeader header =
-        // subjectHeaderService.findByLoginName(loginName);
-        // if (header != null) {
-        // return subjectHeaderLogin(request, header, password);
-        // }
-        if ("aopeng".equals(appIndex)) {
-            ModelAndView aPview = new ModelAndView(AP_MARK_LOGIN_VIEW);
-            aPview.addObject("message", "帐号不存在");
-            return aPview;
-        }
-        ModelAndView view = new ModelAndView(LOGIN_VIEW);
-        view.addObject("message", "帐号不存在");
-        return view;
-    }
-
     /**
      * 登录
      * 
@@ -182,14 +151,9 @@ public class LoginController {
             if (marker != null) {
                 return markerLogin(request, marker, user.getPassword());
             }
-            if ("aopeng".equals(appIndex)) {
-                ModelAndView aPview = new ModelAndView(AP_MARK_LOGIN_VIEW);
-                aPview.addObject("message", "帐号不存在");
-                return aPview;
-            }
             if(loginType!=null){
+                session.setParameter("message", "帐号不存在");
                 ModelAndView view = new ModelAndView("redirect:/mark-login");
-                view.addObject("message", "帐号不存在");
                 return view;
             }
             ModelAndView view = new ModelAndView(LOGIN_VIEW);
@@ -276,16 +240,18 @@ public class LoginController {
      * @return
      */
     @RequestMapping(value = "/mark-login", method = RequestMethod.GET)
-    public ModelAndView loginInit(HttpServletRequest request, @RequestParam(required = false) String message) {
+    public ModelAndView loginInit(HttpServletRequest request) {
+        StmmsSession session = RequestUtils.getSession(request);
+        session.setParameter(LOGIN_TYPE_KEY, "mark-login");
+        String message = session.getParameter("message");
+        session.setParameter("message", null);
         if ("aopeng".equals(appIndex)) {
             ModelAndView aPview = new ModelAndView(AP_MARK_LOGIN_VIEW);
             aPview.addObject("message", StringUtils.trimToNull(message));
             return aPview;
         }
-        StmmsSession session = RequestUtils.getSession(request);
-        session.setParameter(LOGIN_TYPE_KEY, "mark-login");
         ModelAndView modelAndView = new ModelAndView(LOGIN_VIEW);
-        modelAndView.addObject("message", StringUtils.trimToNull(message));
+        modelAndView.addObject(message, StringUtils.trimToNull(message));
         modelAndView.addObject(LOGIN_TYPE_KEY, "mark-login");
         modelAndView.addObject("indexLogo", indexLogo);
         return modelAndView;
@@ -308,20 +274,13 @@ public class LoginController {
         if(loginType!=null){
             modelAndView = new ModelAndView("redirect:/mark-login");
         }
-        ModelAndView modelAndViewForAP = new ModelAndView(AP_MARK_LOGIN_VIEW);
         if (!marker.getPassword().equals(password)) {
-            if ("aopeng".equals(appIndex)) {
-                modelAndViewForAP.addObject("message", "密码错误");
-                return modelAndViewForAP;
-            }
+            session.setParameter("message", "密码错误");
             modelAndView.addObject("message", "密码错误");
             return modelAndView;
         }
         if (marker.isEnable() == false) {
-            if ("aopeng".equals(appIndex)) {
-                modelAndViewForAP.addObject("message", "帐号已禁用");
-                return modelAndViewForAP;
-            }
+            session.setParameter("message", "帐号已禁用");
             modelAndView.addObject("message", "帐号已禁用");
             return modelAndView;
         }
@@ -332,10 +291,7 @@ public class LoginController {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String start = exam.getStartTime() == null ? "" : " 开始时间：" + sdf.format(exam.getStartTime());
             String end = exam.getEndTime() == null ? "" : " 结束时间：" + sdf.format(exam.getEndTime());
-            if ("aopeng".equals(appIndex)) {
-                modelAndViewForAP.addObject("message", "不在评卷时间范围，" + start + " " + end);
-                return modelAndViewForAP;
-            }
+            session.setParameter("message", "不在评卷时间范围 " + start + " " + end);
             modelAndView.addObject("message", "不在评卷时间范围 " + start + " " + end);
             return modelAndView;
         }

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

@@ -302,6 +302,11 @@ function goSearch(){
             alert("开始分值必须小于结束分值");return false;
         }
     }
+    var studentId = parseInt($("#studentId").val());
+    if( $("#studentId").val()!="" && studentId>2147483647 ){
+    	alert("考生编号不合法");
+    };return false;
+    
 	$("#pageNumber").val(1);
 	$("#pageSize").val('${query.pageSize}');
 	$("#searchForm").attr('action','${ctx}/admin/exam/score');

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/markLoginAp.jsp

@@ -15,7 +15,7 @@
     <div class="logo"><a href="${ctx}/"><img src="${ctxStatic}/aopeng/img/logo.png"/></a></div>
     <h1>评卷员登录</h1>
     <div class="login">
-      <form id="loginForm" action="${ctx}/mark-login" method="post">
+      <form id="loginForm" action="${ctx}/login" method="post">
         <div class="text">
           <label>
             <input type="text" id="loginName" name="loginName" value="${loginName}" placeholder="用户名"/>

stmms-web/src/main/webapp/static/mark-track/js/mark-control.js

@@ -595,7 +595,7 @@ MarkControl.prototype.submitTask = function(submitUrl) {
                 libraryId: task.libraryId,
                 totalScore: task.totalScore,
                 scoreList: task.scoreList,
-                trackList: [],
+                trackList: task.trackList,
                 tagList: task.tagList,
                 markId:task.markId,
                 tags: task.tags,