luoshi 6 роки тому
батько
коміт
414a52932f

+ 6 - 5
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/ReportContext.java

@@ -21,8 +21,8 @@ public class ReportContext {
     private Exam exam;
 
     private List<Module> modules;
-    
-    private Map<String,String> subjectMap;
+
+    private Map<String, String> subjectMap;
 
     public ReportContext(Exam exam) {
         this.exam = exam;
@@ -36,7 +36,8 @@ public class ReportContext {
         this.modules.add(new SubjectTeacherClassModule(this));
         this.modules.add(new SubjectQuestionModule(this));
         this.modules.add(new SubjectGroupModule(this));
-        
+        this.modules.add(new SubjectRangeModule(this));
+
         this.subjectMap = new HashMap<String, String>();
     }
 
@@ -64,12 +65,12 @@ public class ReportContext {
     public double getRangeInterval() {
         return 1;
     }
-    
+
     public Integer getExamId() {
         return exam.getId();
     }
 
-    public String getSubjectName(String subjectCode){
+    public String getSubjectName(String subjectCode) {
         return subjectMap.get(subjectCode);
     }
 }

+ 5 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectGroupModule.java

@@ -21,6 +21,11 @@ public class SubjectGroupModule implements Module {
 
     private ReportContext context;
 
+    public SubjectGroupModule(ReportContext context) {
+        this.context = context;
+        this.units = new HashMap<String, BaseCalculatorUnit>();
+    }
+
     public void process(ExamStudent student) {
         if (student.isUpload() && !student.isAbsent() && !student.isBreach() && student.getSubject() != null) {
             double totalScore = student.getTotalScore();