修复评卷员统计，删除管理员专用登录

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkServiceImpl.java

@@ -953,8 +953,10 @@ public class MarkServiceImpl implements MarkService {
             	avgScore = sumScore / finishCount;
             	avgSpent = sumSpent / finishCount;
             	// 递归法计算标准差
-            	tempScore = tempScore + 1.0 * (finishCount - 1) / finishCount * (score - avgScore) * (score - avgScore);
-            	stdevScore = Math.sqrt(tempScore / (finishCount - 1));
+            	if(finishCount-1!=0){
+            		tempScore = tempScore + 1.0 * (finishCount - 1) / finishCount * (score - avgScore) * (score - avgScore);
+            		stdevScore = Math.sqrt(tempScore / (finishCount - 1));
+            	}
             }
         }
         markerDao.updateQualityById(marker.getId(), finishCount, validCount, avgSpent / 1000, avgScore, stdevScore);

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

@@ -303,7 +303,7 @@ public class MarkerController extends BaseExamController {
     }
 
     @RequestMapping(value = "/import", method = RequestMethod.POST)
-    public String importFile(HttpServletRequest request, MultipartFile file, RedirectAttributes redirectAttributes) {
+    public String importFile(HttpServletRequest request, MultipartFile file, RedirectAttributes redirectAttributes,@RequestParam String subjectCode) {
         int examId = getSessionExamId(request);
         try {
             int successNum = 0;
@@ -352,9 +352,7 @@ public class MarkerController extends BaseExamController {
             log.error("Batch import marker error!", e);
             addMessage(redirectAttributes, "导入评卷员失败！失败信息：" + e.getMessage());
         }
-        WebUser wu = RequestUtils.getWebUser(request);
-        List<ExamSubject> list = getExamSubject(examId, wu);
-        return "redirect:" + "/admin/exam/marker?subjectCode="+list.get(0).getCode();
+        return "redirect:" + "/admin/exam/marker?subjectCode="+subjectCode;
     }
 
     @RequestMapping(value = "/importUpdate", method = RequestMethod.POST)

stmms-web/src/main/java/cn/com/qmth/stmms/admin/interceptor/AdminInterceptor.java

@@ -35,7 +35,7 @@ public class AdminInterceptor extends CommonInterceptor {
                 || user.getRole() == Role.SUBJECT_HEADER || user.getRole() == Role.SCHOOL_VIEWER)) {
             return true;
         }
-        return sessionExpire(request, response, "/admin-login");
+        return sessionExpire(request, response, "/login");
     }
 
     protected User buildUser(WebUser wu) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/interceptor/SysAdminInterceptor.java

@@ -27,7 +27,7 @@ public class SysAdminInterceptor extends CommonInterceptor {
         if (wu != null && wu.getRole() == Role.SYS_ADMIN) {
             return true;
         }
-        return sessionExpire(request, response, "/admin-login");
+        return sessionExpire(request, response, "/login");
     }
 
 }

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

@@ -51,7 +51,7 @@ public class LoginController {
     @RequestMapping(value = "/login", method = RequestMethod.GET)
     public ModelAndView login(HttpServletRequest request) {
         StmmsSession session = RequestUtils.getSession(request);
-        session.clear();
+        session.setParameter(LOGIN_TYPE_KEY,null);
         ModelAndView view = new ModelAndView("modules/sys/login");
         view.addObject("indexLogo", indexLogo);
         view.addObject("showType", "admin-login");
@@ -63,7 +63,7 @@ public class LoginController {
             HttpServletResponse response) {
         StmmsSession session = RequestUtils.getSession(request);
         String loginType = session.getParameter(LOGIN_TYPE_KEY);
-        if ("admin-login".equals(showType) || "admin-login".equals(loginType)) {
+        if ("admin-login".equals(showType)) {
             User u = userService.findByLoginName(user.getLoginName());
             if (u != null) {
                 if (u.getPassword().equals(Md5EncryptUtils.md5(user.getPassword()))) {
@@ -98,7 +98,7 @@ public class LoginController {
                 modelAndView.addObject("indexLogo", indexLogo);
                 return modelAndView;
             }
-        } else if ("mark-login".equals(showType) || "mark-login".equals(loginType)) {
+        } else if("mark-login".equals(showType)||"mark-login".equals(loginType)){
             Marker marker = markerService.findByLoginName(user.getLoginName());
             if (marker != null) {
                 ModelAndView modelAndView = new ModelAndView("modules/sys/login");
@@ -146,30 +146,15 @@ public class LoginController {
             view.addObject("showType", showType);
             view.addObject("indexLogo", indexLogo);
             return view;
-        } else {
-            ModelAndView view = new ModelAndView("modules/sys/login");
-            view.addObject("showType", showType);
-            view.addObject("indexLogo", indexLogo);
-            return view;
+        } else{
+        	return new ModelAndView("redirect:/login");
         }
     }
 
-    @RequestMapping(value = "/admin-login", method = RequestMethod.GET)
-    public ModelAndView adminIndex(HttpServletRequest request) {
-        StmmsSession session = RequestUtils.getSession(request);
-        session.clear();
-        session.setParameter(LOGIN_TYPE_KEY, "admin-login");
-        ModelAndView view = new ModelAndView("modules/sys/login");
-        view.addObject(LOGIN_TYPE_KEY, "admin-login");
-        view.addObject("indexLogo", indexLogo);
-        return view;
-    }
-
     @RequestMapping(value = "/mark-login", method = RequestMethod.GET)
     public ModelAndView markIndex(HttpServletRequest request) {
-        StmmsSession session = RequestUtils.getSession(request);
-        session.clear();
-        session.setParameter(LOGIN_TYPE_KEY, "mark-login");
+    	StmmsSession session = RequestUtils.getSession(request);
+    	session.setParameter(LOGIN_TYPE_KEY, "mark-login");
         ModelAndView view = new ModelAndView("modules/sys/login");
         view.addObject(LOGIN_TYPE_KEY, "mark-login");
         view.addObject("indexLogo", indexLogo);
@@ -189,13 +174,12 @@ public class LoginController {
         StmmsSession session = RequestUtils.getSession(request);
         String loginType = session.getParameter(LOGIN_TYPE_KEY);
         RequestUtils.getSession(request).setInvalid(true);
-        if ("admin-login".equals(loginType)) {
-            return new ModelAndView("redirect:/admin-login");
-        } else if ("mark-login".equals(loginType)) {
+        if ("mark-login".equals(loginType)) {
             return new ModelAndView("redirect:/mark-login");
         } else {
             return new ModelAndView("redirect:/login");
         }
     }
 
+    
 }

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

@@ -88,6 +88,7 @@
     <div id="importBox" class="hide">
         <form id="importForm" action="${ctx}/admin/exam/marker/import" method="post" enctype="multipart/form-data"
               style="padding-left:20px;text-align:center;" class="form-search" onsubmit="loading('正在导入，请稍等...');"><br/>
+            <input name="subjectCode" type="hidden" value="${query.subjectCode }"/>
             <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/marker/template">下载模板</a>