xiatian il y a 10 mois
Parent
commit
c72f2e5e7d

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

@@ -96,13 +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);
+        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());
@@ -314,13 +314,13 @@ public class ExamController extends BaseExamController {
         model.addAttribute("subjectCount", subjectService.count(examId));
         model.addAttribute("studentCount", studentService.countByExamId(examId));
         model.addAttribute("subjectiveStudentCount", studentService.countSubjectiveByExamId(examId));
-        long sheetCount=studentService.countSheetCountByExamId(examId) / 2;
-        model.addAttribute("sheetCount", sheetCount);
+        long totalPaperCount = studentService.countSheetCountByExamId(examId) / 2;
         model.addAttribute("objectiveStudentCount", studentService.countObjectiveByExamId(examId));
-        long objectivePaperCount=studentService.countObjectivePageCountByExamId(examId) / 2;
+        long objectivePaperCount = studentService.countObjectivePageCountByExamId(examId) / 2;
+        model.addAttribute("subjectivePaperCount", totalPaperCount - objectivePaperCount);
         model.addAttribute("objectivePaperCount", objectivePaperCount);
         model.addAttribute("allUploadStudentCount", studentService.countAllUploadByExamId(examId));
-        model.addAttribute("totalPaperCount", objectivePaperCount+sheetCount);
+        model.addAttribute("totalPaperCount", totalPaperCount);
         return "modules/exam/examExport";
     }
 }

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examExport.jsp

@@ -83,7 +83,7 @@
                     <input value="A3" />
                   </td>
                   <td><input value="${subjectiveStudentCount}"/></td>
-                  <td><input value="${sheetCount}" /></td>
+                  <td><input value="${subjectivePaperCount}" /></td>
                   <td><input /></td>
                   <td><input /></td>
                   <td><input /></td>