update

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/ExamStudentService.java

@@ -172,4 +172,10 @@ public interface ExamStudentService {
 
     Map<Integer, List<PictureTag>> buildSliceTags(ExamStudent student, boolean withGroupScore);
 
+    public long countByExamIdAndSubjectCodeAndCollege(Integer examId, String subjectCode, String collegeName);
+
+    public long countByExamIdAndSubjectCodeAndClass(Integer examId, String subjectCode, String className);
+
+    public long countByExamIdAndSubjectCodeAndTeacher(Integer examId, String subjectCode, String teacherName);
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -1230,4 +1230,31 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         return map;
     }
 
+    @Override
+    public long countByExamIdAndSubjectCodeAndCollege(Integer examId, String subjectCode, String collegeName) {
+        ExamStudentSearchQuery query = new ExamStudentSearchQuery();
+        query.setExamId(examId);
+        query.setSubjectCode(subjectCode);
+        query.setCollege(collegeName);
+        return countByQuery(query);
+    }
+
+    @Override
+    public long countByExamIdAndSubjectCodeAndClass(Integer examId, String subjectCode, String className) {
+        ExamStudentSearchQuery query = new ExamStudentSearchQuery();
+        query.setExamId(examId);
+        query.setSubjectCode(subjectCode);
+        query.setClassName(className);
+        return countByQuery(query);
+    }
+
+    @Override
+    public long countByExamIdAndSubjectCodeAndTeacher(Integer examId, String subjectCode, String teacherName) {
+        ExamStudentSearchQuery query = new ExamStudentSearchQuery();
+        query.setExamId(examId);
+        query.setSubjectCode(subjectCode);
+        query.setTeacher(teacherName);
+        return countByQuery(query);
+    }
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectClassModule.java

@@ -3,6 +3,7 @@ package cn.com.qmth.stmms.biz.report.utils.module;
 import org.apache.commons.lang.StringUtils;
 
 import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
+import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
 import cn.com.qmth.stmms.biz.report.model.ReportSubjectClass;
 import cn.com.qmth.stmms.biz.report.service.ReportSubjectClassService;
 import cn.com.qmth.stmms.biz.report.utils.Module;
@@ -23,6 +24,7 @@ public class SubjectClassModule extends SubjectModule implements Module {
 
     public void save() {
         ReportSubjectClassService service = SpringContextHolder.getBean(ReportSubjectClassService.class);
+        ExamStudentService studentService = SpringContextHolder.getBean(ExamStudentService.class);
         for (String key : this.units.keySet()) {
             String s[] = key.split("\t");
             if (s.length > 1) {
@@ -45,7 +47,8 @@ public class SubjectClassModule extends SubjectModule implements Module {
                 r.setCoefficient(unit.coefficient);
                 r.setDifficulty(unit.difficulty);
                 r.setStdev(unit.stdev);
-                r.setTotalCount(counter.totalCount);
+                r.setTotalCount((int) studentService.countByExamIdAndSubjectCodeAndClass(this.context.getExamId(),
+                        subjectCode, className));
                 r.setRealityCount(counter.realityCount);
                 service.save(r);
             }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectCollegeModule.java

@@ -3,6 +3,7 @@ package cn.com.qmth.stmms.biz.report.utils.module;
 import org.apache.commons.lang.StringUtils;
 
 import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
+import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
 import cn.com.qmth.stmms.biz.report.model.ReportSubjectCollege;
 import cn.com.qmth.stmms.biz.report.service.ReportSubjectCollegeService;
 import cn.com.qmth.stmms.biz.report.utils.Module;
@@ -23,6 +24,7 @@ public class SubjectCollegeModule extends SubjectModule implements Module {
 
     public void save() {
         ReportSubjectCollegeService service = SpringContextHolder.getBean(ReportSubjectCollegeService.class);
+        ExamStudentService studentService = SpringContextHolder.getBean(ExamStudentService.class);
         for (String key : this.units.keySet()) {
             String s[] = key.split("\t");
             if (s.length > 1) {
@@ -42,7 +44,8 @@ public class SubjectCollegeModule extends SubjectModule implements Module {
                 r.setPassRate(unit.passRate);
                 r.setExcellentCount(unit.excellentCount);
                 r.setExcellentRate(unit.excellentRate);
-                r.setTotalCount(counter.totalCount);
+                r.setTotalCount((int) studentService.countByExamIdAndSubjectCodeAndCollege(this.context.getExamId(),
+                        subjectCode, collegeName));
                 r.setRealityCount(counter.realityCount);
                 service.save(r);
             }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectTeacherClassModule.java

@@ -23,6 +23,7 @@ public class SubjectTeacherClassModule extends SubjectModule implements Module {
     }
 
     public void save() {
+        ReportSubjectTeacherClassService service = SpringContextHolder.getBean(ReportSubjectTeacherClassService.class);
         for (String key : this.units.keySet()) {
             String s[] = key.split("\t");
             if (s.length > 2) {
@@ -31,7 +32,6 @@ public class SubjectTeacherClassModule extends SubjectModule implements Module {
                 String className = s[2];
                 BaseCalculatorUnit unit = units.get(key);
                 BaseCounter counter = counters.get(key);
-                ReportSubjectTeacherClassService service = SpringContextHolder.getBean(ReportSubjectTeacherClassService.class);
                 ReportSubjectTeacherClass teacherClass = new ReportSubjectTeacherClass();
                 teacherClass.setExamId(this.context.getExamId());
                 teacherClass.setSubjectCode(subjectCode);
@@ -49,7 +49,7 @@ public class SubjectTeacherClassModule extends SubjectModule implements Module {
                 service.save(teacherClass);
             }
         }
-        
+
     }
 
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectTeacherModule.java

@@ -3,6 +3,7 @@ package cn.com.qmth.stmms.biz.report.utils.module;
 import org.apache.commons.lang.StringUtils;
 
 import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
+import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
 import cn.com.qmth.stmms.biz.report.model.ReportSubjectTeacher;
 import cn.com.qmth.stmms.biz.report.service.ReportSubjectTeacherService;
 import cn.com.qmth.stmms.biz.report.utils.Module;
@@ -23,6 +24,7 @@ public class SubjectTeacherModule extends SubjectModule implements Module {
 
     public void save() {
         ReportSubjectTeacherService service = SpringContextHolder.getBean(ReportSubjectTeacherService.class);
+        ExamStudentService studentService = SpringContextHolder.getBean(ExamStudentService.class);
 
         for (String key : this.units.keySet()) {
             BaseCalculatorUnit unit = units.get(key);
@@ -37,7 +39,8 @@ public class SubjectTeacherModule extends SubjectModule implements Module {
                 subject.setSubjectName(context.getSubject(subjectCode).getName());
                 subject.setTeacherName(teacherName);
                 subject.setRealityCount(counter.realityCount);
-                subject.setTotalCount(counter.totalCount);
+                subject.setTotalCount((int) studentService.countByExamIdAndSubjectCodeAndTeacher(
+                        this.context.getExamId(), subjectCode, teacherName));
                 subject.setPassCount(unit.passCount);
                 subject.setExcellentCount(unit.excellentCount);
                 subject.setMaxScore(unit.maxScore);

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

@@ -28,7 +28,7 @@
         </select>
         <label>分组</label>
         <select class="input-medium" id="group-select" name="groupNumber">
-            <option value="0">请选择</option>
+            <option value="">请选择</option>
             <c:forEach items="${groupList}" var="item">
                 <option value="${item.number}" <c:if test="${item.number==query.groupNumber}">selected</c:if>>${item.number}-${item.title}</option>
             </c:forEach>