|
@@ -551,7 +551,7 @@ public class CoreController extends BaseApiController {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
- private List<ExamQuestion> parseQustionList(QuestionDTO[] questions, Integer examId, String subjectCode,
|
|
|
|
|
|
+ private List<ExamQuestion> parseQustionList(List<QuestionDTO> questions, Integer examId, String subjectCode,
|
|
String paperType, boolean objective) {
|
|
String paperType, boolean objective) {
|
|
List<ExamQuestion> list = new ArrayList<ExamQuestion>();
|
|
List<ExamQuestion> list = new ArrayList<ExamQuestion>();
|
|
for (QuestionDTO dto : questions) {
|
|
for (QuestionDTO dto : questions) {
|
|
@@ -600,7 +600,7 @@ public class CoreController extends BaseApiController {
|
|
value.accumulate("objective", q.isObjective());
|
|
value.accumulate("objective", q.isObjective());
|
|
value.accumulate("mainNumber", q.getMainNumber());
|
|
value.accumulate("mainNumber", q.getMainNumber());
|
|
value.accumulate("subNumber", q.getSubNumber());
|
|
value.accumulate("subNumber", q.getSubNumber());
|
|
- value.accumulate("mainTitle", q.getMainNumber());
|
|
|
|
|
|
+ value.accumulate("mainTitle", q.getMainTitle());
|
|
value.accumulate("totalScore", q.getTotalScore());
|
|
value.accumulate("totalScore", q.getTotalScore());
|
|
value.accumulate("answer", q.getAnswer() == null ? "" : q.getAnswer());
|
|
value.accumulate("answer", q.getAnswer() == null ? "" : q.getAnswer());
|
|
result.add(value);
|
|
result.add(value);
|