|
@@ -127,7 +127,7 @@ public class ExportStudentAnswerAndScoreDetailTask {
|
|
}
|
|
}
|
|
|
|
|
|
// dynamicExcelHeaders.add(String.format("%s%s-%s-ID", question.getQuestionType().getDesc(), question.getMainNumber(), question.getOrder()));
|
|
// dynamicExcelHeaders.add(String.format("%s%s-%s-ID", question.getQuestionType().getDesc(), question.getMainNumber(), question.getOrder()));
|
|
- // dynamicExcelHeaders.add(String.format("%s%s-%s答案", question.getQuestionType().getDesc(), question.getMainNumber(), question.getOrder()));
|
|
|
|
|
|
+ dynamicExcelHeaders.add(String.format("%s%s-%s答案", question.getQuestionType().getDesc(), question.getMainNumber(), question.getOrder()));
|
|
dynamicExcelHeaders.add(String.format("%s%s-%s作答", question.getQuestionType().getDesc(), question.getMainNumber(), question.getOrder()));
|
|
dynamicExcelHeaders.add(String.format("%s%s-%s作答", question.getQuestionType().getDesc(), question.getMainNumber(), question.getOrder()));
|
|
dynamicExcelHeaders.add(String.format("%s%s-%s得分", question.getQuestionType().getDesc(), question.getMainNumber(), question.getOrder()));
|
|
dynamicExcelHeaders.add(String.format("%s%s-%s得分", question.getQuestionType().getDesc(), question.getMainNumber(), question.getOrder()));
|
|
}
|
|
}
|
|
@@ -161,7 +161,7 @@ public class ExportStudentAnswerAndScoreDetailTask {
|
|
}
|
|
}
|
|
|
|
|
|
// dynamicColumnValues.add(question.getQuestionId());
|
|
// dynamicColumnValues.add(question.getQuestionId());
|
|
- // dynamicColumnValues.add(correctAnswer);
|
|
|
|
|
|
+ dynamicColumnValues.add(correctAnswer);
|
|
dynamicColumnValues.add(studentAnswer);
|
|
dynamicColumnValues.add(studentAnswer);
|
|
if (correctAnswer.equals(studentAnswer)) {
|
|
if (correctAnswer.equals(studentAnswer)) {
|
|
dynamicColumnValues.add(question.getQuestionScore() != null ? String.valueOf(question.getQuestionScore()) : "0");
|
|
dynamicColumnValues.add(question.getQuestionScore() != null ? String.valueOf(question.getQuestionScore()) : "0");
|
|
@@ -171,8 +171,8 @@ public class ExportStudentAnswerAndScoreDetailTask {
|
|
} else {
|
|
} else {
|
|
if (needSubjective) {
|
|
if (needSubjective) {
|
|
// dynamicColumnValues.add(question.getQuestionId());
|
|
// dynamicColumnValues.add(question.getQuestionId());
|
|
- // String correctAnswer = question.getCorrectAnswer() != null ? question.getCorrectAnswer() : "";
|
|
|
|
- // dynamicColumnValues.add(Jsoup.clean(correctAnswer, Safelist.simpleText()));
|
|
|
|
|
|
+ String correctAnswer = question.getCorrectAnswer() != null ? question.getCorrectAnswer() : "";
|
|
|
|
+ dynamicColumnValues.add(Jsoup.clean(correctAnswer, Safelist.simpleText()));
|
|
String studentAnswer = question.getStudentAnswer() != null ? question.getStudentAnswer() : "";
|
|
String studentAnswer = question.getStudentAnswer() != null ? question.getStudentAnswer() : "";
|
|
dynamicColumnValues.add(Jsoup.clean(studentAnswer, Safelist.simpleText()));
|
|
dynamicColumnValues.add(Jsoup.clean(studentAnswer, Safelist.simpleText()));
|
|
|
|
|