Ver Fonte

小题/大题分析增加对填充试题的判断,填充试题不参与分析范围

luoshi há 6 anos atrás
pai
commit
8357f41588

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

@@ -47,6 +47,9 @@ public class SubjectGroupModule implements Module {
         int scoreCount = scoreList.size();
         for (int i = 0; i < questionList.size(); i++) {
             ExamQuestion question = questionList.get(i);
+            if (question.getTotalScore() == null || question.getTotalScore() == 0) {
+                continue;
+            }
             ScoreItem item = scoreCount > i ? scoreList.get(i) : null;
             QuestionGroup group = map.get(question.getMainNumber());
             if (group == null) {
@@ -58,6 +61,9 @@ public class SubjectGroupModule implements Module {
         }
         for (Entry<Integer, QuestionGroup> entry : map.entrySet()) {
             QuestionGroup group = entry.getValue();
+            if (group.getFullScore() == 0) {
+                continue;
+            }
             findUnit(subjectCode + "\t" + objective + "\t" + entry.getKey()).process(group.getTotalScore(),
                     group.getFullScore(), totalScore);
         }

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

@@ -43,6 +43,9 @@ public class SubjectQuestionModule implements Module {
         int scoreCount = scoreList.size();
         for (int i = 0; i < questionList.size(); i++) {
             ExamQuestion question = questionList.get(i);
+            if (question.getTotalScore() == null || question.getTotalScore() == 0) {
+                continue;
+            }
             ScoreItem item = scoreCount > i ? scoreList.get(i) : null;
             double score = item != null ? item.getScore() : 0;
             findUnit(getKey(question)).process(score, question.getTotalScore(), totalScore);