fixbugs

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

@@ -150,7 +150,7 @@ public class ImportQueryController extends BaseExamController {
             List<InspectedStudentVO> list = ei.getDataList(InspectedStudentVO.class);
             if (list.size() > 1000) {
                 addMessage(redirectAttributes, "导入考生失败！数据超过1000行");
-                return "redirect:/admin/exam/inspected";
+                return "redirect:/admin/exam/inspected/list";
             }
             for (InspectedStudentVO studentVO : list) {
                 if (StringUtils.isBlank(studentVO.getStudentCode()) || StringUtils.isBlank(studentVO.getSubjectCode())) {
@@ -187,7 +187,7 @@ public class ImportQueryController extends BaseExamController {
         } catch (Exception e) {
             log.error("Batch import inpectedStudent error!", e);
             addMessage(redirectAttributes, "导入考生失败！失败信息：" + e.getMessage());
-            return "redirect:/admin/exam/inspected";
+            return "redirect:/admin/exam/inspected/list";
         }
         return "redirect:/admin/exam/inspected/import/list";
     }
@@ -199,7 +199,7 @@ public class ImportQueryController extends BaseExamController {
         WebUser wu = RequestUtils.getWebUser(request);
         queryService.deleteByExamIdAndUserIdAndType(examId, wu.getId(), ImportType.INSPECTED);
         addMessage(redirectAttributes, "重置成功");
-        return "redirect:/admin/exam/inspected";
+        return "redirect:/admin/exam/inspected/list";
     }
 
     @RequestMapping(value = "/export")

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

@@ -118,6 +118,10 @@ public class MarkQualityController extends BaseExamController {
                             getLockKey(examId, query.getSubjectCode(), query.getGroupNumber())));
             for (Marker marker : query.getResult()) {
                 marker.setUser(userService.findById(marker.getUserId()));
+                MarkGroup group = groupService.findOne(examId, marker.getSubjectCode(), marker.getGroupNumber());
+                group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
+                        marker.getSubjectCode(), false, group.getNumber()));
+                marker.setGroup(group);
             }
         }
         model.addAttribute("query", query);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -365,6 +365,7 @@ public class UserController extends BaseExamController {
                 continue;
             }
             user.setEnable(enable);
+            markerService.updateEnableByUserId(id, enable);
             userService.save(user);
         }
         return "redirect:/admin/user/list";

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

@@ -366,6 +366,7 @@
         var rejectId=$("#rejectId").val();
         if(rejectReason==""||rejectReason==undefined){
         	alert("请选择打回原因");
+        	return false;
         }
         if(rejectReasonInput!="" ||rejectReasonInput!=null){
         	rejectReason =rejectReason+":"+rejectReasonInput;

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

@@ -50,7 +50,7 @@
 	<table id="contentTable" class="table table-striped table-bordered table-condensed">
 		<thead>
 			<tr>
-				<th>分组序号</th>
+				<th>分组</th>
 				<th>评卷员</th>
 				<th>姓名</th>
 				<th>完成任务数</th>
@@ -64,7 +64,10 @@
 		<tbody>
 		<c:forEach items="${query.result}" var="marker">
 			<tr>
-				<td>${marker.groupNumber}</td>
+				<td><c:if test="${marker.group!=null}">
+                    ${marker.group.number}-${marker.group.title}
+                	</c:if>
+                </td>
 				<td>${marker.user.loginName}</td>
 				<td>${marker.user.name}</td>
 				<td>${marker.finishCount}</td>

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

@@ -126,7 +126,7 @@
 	    <div class="task-header">
 	        <p class="title">设置选做题规则</p>
 	        <p class="image-close"><img src="${ctxStatic}/mark-new/images/images-close.png"/></p></div>
-	    <div class="task-content">选做题规则：<input type="number" id="selectivePart" name="selectivePart" class="task-count"/>选<input type="number" id="selectiveCount" name="selectiveCount" class="task-count"/><br/><br/>
+	    <div class="task-content">选做题规则：<input type="number" id="selectivePart" name="selectivePart" class="task-count" oninput="if(value<0)value=0"/>选<input type="number" id="selectiveCount" name="selectiveCount" class="task-count" oninput="if(value<0)value=0"/><br/><br/>
 	    取分规则：<select name="scorePolicy">
 	    			<%-- <c:forEach items="${scorePolicyList}" var="item"> --%>
                         <option value="2">最高分</option>