创建考试默认值

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

@@ -96,6 +96,13 @@ public class ExamController extends BaseExamController {
     @RequestMapping("/create")
     @RoleRequire(Role.SCHOOL_ADMIN)
     public String add(Exam exam, Model model) {
+    	exam.setMarkMode(MarkMode.TRACK);
+    	exam.setForbiddenInfo(true);
+    	exam.setForbiddenScore(true);
+    	exam.setInspectUnrepeated(true);
+    	exam.setInspectScrollBottom(true);
+    	exam.setInspectRoundLimit(true);
+    	exam.setShowReject(true);
         model.addAttribute("exam", exam);
         model.addAttribute("statusList", ExamStatus.values());
         model.addAttribute("typeList", ExamType.values());

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

@@ -59,7 +59,6 @@ import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.enums.SelectiveStatus;
 import cn.com.qmth.stmms.common.enums.SubjectiveStatus;
-import cn.com.qmth.stmms.common.utils.DateUtils;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 import net.sf.json.JSONObject;
@@ -352,7 +351,6 @@ public class InspectedController extends BaseExamController {
         return obj;
     }
     
-    @Logging(menu = "再次复核验证", type = LogType.UPDATE)
     @RequestMapping(value = "nextround/check", method = RequestMethod.POST)
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER, Role.INSPECTOR, Role.COLLEGE_ADMIN })
     @ResponseBody
@@ -410,7 +408,6 @@ public class InspectedController extends BaseExamController {
     @RequestMapping(value = "nextround", method = RequestMethod.POST)
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER, Role.INSPECTOR, Role.COLLEGE_ADMIN })
     public String nextround(RedirectAttributes ra, HttpServletRequest request, @RequestParam String subjectCode) {
-    	WebUser wu = RequestUtils.getWebUser(request); 
     	String url="redirect:/admin/exam/inspected/list?subjectCode="+subjectCode;
         int examId = getSessionExamId(request);
         lockService.waitlock(LockType.EXAM_SUBJECT, examId, subjectCode);
@@ -418,10 +415,9 @@ public class InspectedController extends BaseExamController {
         	Exam exam = examService.findById(examId);
         	ExamSubject es = subjectService.find(examId, subjectCode);
         	StringBuilder sb=new StringBuilder();
-            sb.append("开启人："+wu.getUser().getName()+"("+wu.getUser().getLoginName()+")");
-            sb.append(" | 时间："+DateUtils.getDateTime());
+        	sb.append("科目代码："+subjectCode);
             sb.append(" | 开启第"+(es.getInspectRound()+1)+"轮");
-            sb.append(" | 科目代码："+subjectCode);
+            sb.append(" | 上轮进度");
         	ExamStudentSearchQuery sQuery = new ExamStudentSearchQuery();
 	        sQuery.setExamId(examId);
 	        sQuery.setUpload(true);
@@ -437,9 +433,9 @@ public class InspectedController extends BaseExamController {
 	            	long inspectedCount = studentService.countByQuery(sQuery);
 	            	sQuery.setInspected(null);
 			        long totalCount = studentService.countByQuery(sQuery);
-			        sb.append(" | 总量："+totalCount);
-			        sb.append(" | 已复核："+inspectedCount);
-			        sb.append(" | 未复核："+(totalCount-inspectedCount));
+			        sb.append(" 总量："+totalCount);
+			        sb.append(" 已复核："+inspectedCount);
+			        sb.append(" 未复核："+(totalCount-inspectedCount));
 	            	subjectService.nextInspectRound(examId, subjectCode);
 	            	
 	            	RequestUtils.setLog(request, sb.toString());
@@ -453,9 +449,9 @@ public class InspectedController extends BaseExamController {
 		        }
 		        sQuery.setInspected(null);
 		        long totalCount = studentService.countByQuery(sQuery);
-		        sb.append(" | 总量："+totalCount);
-		        sb.append(" | 已复核："+inspectedCount);
-		        sb.append(" | 未复核："+(totalCount-inspectedCount));
+		        sb.append(" 总量："+totalCount);
+		        sb.append(" 已复核："+inspectedCount);
+		        sb.append(" 未复核："+(totalCount-inspectedCount));
 		        subjectService.nextInspectRound(examId, subjectCode);
 		        RequestUtils.setLog(request, sb.toString());
                 return url;

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

@@ -56,6 +56,7 @@
 						$("#forbiddenScoreDiv").hide();
 					}
 				});
+				$("#forbiddenInfo").trigger('change');
 			});
 </script>
 <style type="text/css">
@@ -130,7 +131,7 @@
 				<select name="markMode">
 					<option value="">不限</option>
 					<c:forEach items="${markModeList}" var="item">
-						<option value="${item}">${item.name}</option>
+						<option <c:if test="${exam.markMode!=null && exam.markMode==item}">selected</c:if> value="${item}">${item.name}</option>
 					</c:forEach>
 				</select>
 			</div>