|
@@ -66,7 +66,7 @@ public class SubjectQuestionLevelModule implements Module {
|
|
List<ExamQuestion> slist = subjectiveQuestions.get(student.getSubjectCode());
|
|
List<ExamQuestion> slist = subjectiveQuestions.get(student.getSubjectCode());
|
|
if (slist == null) {
|
|
if (slist == null) {
|
|
slist = new ArrayList<ExamQuestion>();
|
|
slist = new ArrayList<ExamQuestion>();
|
|
- subjectiveQuestions.put(key, slist);
|
|
|
|
|
|
+ subjectiveQuestions.put(student.getSubjectCode(), slist);
|
|
slist.addAll(student.getSubjectiveQuestionList());
|
|
slist.addAll(student.getSubjectiveQuestionList());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -150,7 +150,7 @@ public class SubjectQuestionLevelModule implements Module {
|
|
for (Entry<String, List<ExamQuestion>> entry : objectiveQuestions.entrySet()) {
|
|
for (Entry<String, List<ExamQuestion>> entry : objectiveQuestions.entrySet()) {
|
|
String[] keys = entry.getKey().split("\t");
|
|
String[] keys = entry.getKey().split("\t");
|
|
String subjectCode = keys[0];
|
|
String subjectCode = keys[0];
|
|
- String paperType = StringUtils.trimToNull(keys[1]);
|
|
|
|
|
|
+ String paperType = keys.length > 1 ? StringUtils.trimToNull(keys[1]) : null;
|
|
if (paperType != null) {
|
|
if (paperType != null) {
|
|
Set<String> set = paperTypes.get(subjectCode);
|
|
Set<String> set = paperTypes.get(subjectCode);
|
|
if (set == null) {
|
|
if (set == null) {
|