修改评卷员考试科目选择的页面bug；评卷状态栏左上角增加分组显示

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

@@ -113,7 +113,7 @@ public class MarkController extends BaseController {
     }
 
     @RequestMapping(value = "/subject-select", method = RequestMethod.GET)
-    public ModelAndView select(HttpServletRequest request) {
+    public ModelAndView select(HttpServletRequest request, @RequestParam(required = false) Integer examId) {
         ModelAndView modelAndView = new ModelAndView("modules/mark/subjectSelect");
         User user = RequestUtils.getWebUser(request).getUser();
         Calendar rightNow = Calendar.getInstance();
@@ -121,6 +121,12 @@ public class MarkController extends BaseController {
         rightNow.add(Calendar.YEAR, -1);
         List<Exam> examList = examService.findByMarkerUserId(user.getId(), rightNow.getTime());
         modelAndView.addObject("examList", examList);
+        if (examId != null) {
+            Exam exam = examService.findById(examId);
+            if (exam != null && exam.getStatus() == ExamStatus.START) {
+                modelAndView.addObject("exam", exam);
+            }
+        }
         return modelAndView;
     }
 
@@ -151,7 +157,7 @@ public class MarkController extends BaseController {
     public ModelAndView select(HttpServletRequest request, HttpServletResponse response,
             @RequestParam Integer markerId) {
         WebUser user = RequestUtils.getWebUser(request);
-        ModelAndView modelAndView = new ModelAndView("modules/mark/subjectSelectAp");
+        ModelAndView modelAndView = new ModelAndView("modules/mark/subjectSelect");
         Calendar rightNow = Calendar.getInstance();
         rightNow.setTime(new Date());
         rightNow.add(Calendar.YEAR, -1);

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markNew.jsp

@@ -73,7 +73,7 @@
                 'image-builder': {},
                 'mark-status': {
                     simple: false,
-                    subjectName: '${subject.displayName}'
+                    subjectName: '${subject.displayName}_${marker.groupNumber}'
                 },
                 'mark-history': {
                     pageSize: 10

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/subjectSelect.jsp

@@ -42,7 +42,7 @@
                     var first = '';
                     for (var i = 0; i < result.length; i++) {
                         var marker = result[i];
-                        $('<option value="' + marker.id + '">' + marker.subjectCode + '-' + marker.subjectName + '</option>').appendTo(parent);
+                        $('<option value="' + marker.id + '">' + marker.subjectCode + '_' + marker.subjectName + '</option>').appendTo(parent);
                         if (i == 0) {
                             first = marker.id;
                         }
@@ -59,6 +59,8 @@
                 }
             });
 
+            $('#exam-select').trigger("change");
+
         });
 
         function showError(message) {
@@ -99,7 +101,7 @@
                     <div class="option">
                         <select name="markerId" id="marker-select">
                             <c:if test="${subject!=null}">
-                                <option value="">${subject.name}</option>
+                                <option value="">${subject.code}_${subject.name}</option>
                             </c:if>
                         </select>
                     </div>